Fix bug with ColorPicker

Benjamin Renard
1 parent 5ea836ce
Showing 3 changed files with 9 additions and 8 deletions Show diff stats
js/app/views/DefaultTreeGrid.js
js/app/views/ColorPicker.js -> js/app/views/GridColorPicker.js
js/app/views/StatusGrid.js
@@ -6,7 +6,7 @@ Ext.define(&#39;amdaUI.DefaultTreeGrid&#39;, {
         'Ext.grid.*',
         'Ext.tree.*',
         'amdaModel.DefaultValuesModel',
-        'amdaUI.ColorPicker',
+        'amdaUI.GridColorPicker',
         'amdaUI.ColorMap'
     ],    
     xtype: 'tree-grid',
@@ -68,7 +68,7 @@ Ext.define(&#39;amdaUI.DefaultTreeGrid&#39;, {
                     }
                     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(&#39;amdaUI.DefaultTreeGrid&#39;, {
                         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(&#39;amdaUI.DefaultTreeGrid&#39;, {
                         }
                         else{
                             if(me.isHexCode(value)){
-                                fieldType = 'colorpicker'
+                                fieldType = 'gridcolorpicker'
                             }
                             else if(value === true || value === false){
                                 fieldType = 'combobox'
-Ext.define('amdaUI.ColorPicker', {
+Ext.define('amdaUI.GridColorPicker', {
     extend: 'Ext.form.field.Picker',
-    alias: 'widget.colorpicker',
+    alias: 'widget.gridcolorpicker',
     toUpper : function(x){ 
         return x.toUpperCase();
     },
@@ -4,11 +4,11 @@ Ext.define(&#39;StatusColorEditor&#39;, {
     alias: 'widget.statuscoloreditor',
     requires: [
-        'amdaUI.ColorPicker'
+        'amdaUI.GridColorPicker'
     ],
     field: {
-        xtype: 'colorpicker'
+        xtype: 'gridcolorpicker'
     },
 });
@@ -158,7 +158,6 @@ Ext.define(&#39;amdaUI.StatusGrid&#39;, {
         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>';
             },