From 58780dd251921c0b4ed6975f3e04e4815252dec3 Mon Sep 17 00:00:00 2001
From: Benjamin Renard <benjamin.renard@akka.eu>
Date: Mon, 22 May 2023 07:24:58 +0000
Subject: [PATCH] Fix bug with ColorPicker
---
js/app/views/ColorPicker.js | 31 -------------------------------
js/app/views/DefaultTreeGrid.js | 8 +++++---
js/app/views/GridColorPicker.js | 31 +++++++++++++++++++++++++++++++
js/app/views/StatusGrid.js | 5 ++---
4 files changed, 38 insertions(+), 37 deletions(-)
delete mode 100644 js/app/views/ColorPicker.js
create mode 100644 js/app/views/GridColorPicker.js
diff --git a/js/app/views/ColorPicker.js b/js/app/views/ColorPicker.js
deleted file mode 100644
index 91e91e7..0000000
--- a/js/app/views/ColorPicker.js
+++ /dev/null
@@ -1,31 +0,0 @@
-Ext.define('amdaUI.ColorPicker', {
- extend: 'Ext.form.field.Picker',
- alias: 'widget.colorpicker',
- toUpper : function(x){
- return x.toUpperCase();
- },
- replaceColor : function(x){
- return x.replace("#","");
- },
- createPicker: function() {
- var me = this;
- return Ext.create('Ext.picker.Color', {
- pickerField: me,
- renderTo: Ext.getBody(),
- floating: true,
- minWidth: 133,
- maxWidth: 200,
- minHeight: 225,
- autoScroll:true,
- focusOnShow: true,
- colors: amdaDefaultConfigs.availableColorsNew.map(this.replaceColor).map(this.toUpper),
- listeners: {
- select: function(picker, color) {
- me.setValue('#'+color);
- me.picker.hide();
- },
- scope: me
- }
- });
- }
-});
\ No newline at end of file
diff --git a/js/app/views/DefaultTreeGrid.js b/js/app/views/DefaultTreeGrid.js
index 5fca486..c63277d 100644
--- a/js/app/views/DefaultTreeGrid.js
+++ b/js/app/views/DefaultTreeGrid.js
@@ -6,7 +6,7 @@ Ext.define('amdaUI.DefaultTreeGrid', {
'Ext.grid.*',
'Ext.tree.*',
'amdaModel.DefaultValuesModel',
- 'amdaUI.ColorPicker',
+ 'amdaUI.GridColorPicker',
'amdaUI.ColorMap'
],
xtype: 'tree-grid',
@@ -68,7 +68,7 @@ Ext.define('amdaUI.DefaultTreeGrid', {
}
var value = context.record.get(context.field);
if (me.isHexCode(value)) {
- var colorPicker = Ext.create('amdaUI.ColorPicker', {
+ var colorPicker = Ext.create('amdaUI.GridColorPicker', {
pickerField: context.field,
value: value,
listeners: {
@@ -136,6 +136,8 @@ Ext.define('amdaUI.DefaultTreeGrid', {
if (option && option.type){
fieldType = option.type;
+ if (fieldType == 'colorpicker')
+ fieldType = 'gridcolorpicker';
var myStore = Ext.create('Ext.data.Store', {
fields: ['key', 'value'],
data: option.store
@@ -145,7 +147,7 @@ Ext.define('amdaUI.DefaultTreeGrid', {
}
else{
if(me.isHexCode(value)){
- fieldType = 'colorpicker'
+ fieldType = 'gridcolorpicker'
}
else if(value === true || value === false){
fieldType = 'combobox'
diff --git a/js/app/views/GridColorPicker.js b/js/app/views/GridColorPicker.js
new file mode 100644
index 0000000..7527c85
--- /dev/null
+++ b/js/app/views/GridColorPicker.js
@@ -0,0 +1,31 @@
+Ext.define('amdaUI.GridColorPicker', {
+ extend: 'Ext.form.field.Picker',
+ alias: 'widget.gridcolorpicker',
+ toUpper : function(x){
+ return x.toUpperCase();
+ },
+ replaceColor : function(x){
+ return x.replace("#","");
+ },
+ createPicker: function() {
+ var me = this;
+ return Ext.create('Ext.picker.Color', {
+ pickerField: me,
+ renderTo: Ext.getBody(),
+ floating: true,
+ minWidth: 133,
+ maxWidth: 200,
+ minHeight: 225,
+ autoScroll:true,
+ focusOnShow: true,
+ colors: amdaDefaultConfigs.availableColorsNew.map(this.replaceColor).map(this.toUpper),
+ listeners: {
+ select: function(picker, color) {
+ me.setValue('#'+color);
+ me.picker.hide();
+ },
+ scope: me
+ }
+ });
+ }
+});
\ No newline at end of file
diff --git a/js/app/views/StatusGrid.js b/js/app/views/StatusGrid.js
index 8407acf..a649e6b 100644
--- a/js/app/views/StatusGrid.js
+++ b/js/app/views/StatusGrid.js
@@ -4,11 +4,11 @@ Ext.define('StatusColorEditor', {
alias: 'widget.statuscoloreditor',
requires: [
- 'amdaUI.ColorPicker'
+ 'amdaUI.GridColorPicker'
],
field: {
- xtype: 'colorpicker'
+ xtype: 'gridcolorpicker'
},
});
@@ -158,7 +158,6 @@ Ext.define('amdaUI.StatusGrid', {
return {
text: 'Color',dataIndex: 'color', width: 40, menuDisabled: true,
renderer: function(value) {
- console.log(value);
return '<div style="background-color:' + value + '; margin-left: auto; \
margin-right: auto;width:15px;height:15px;"></div>';
},
--
libgit2 0.21.2