Fix bug after merge

Benjamin Renard
1 parent 9b67ae6b
Showing 2 changed files with 10 additions and 5 deletions Show diff stats
js/app/views/ColorMap.js
js/app/views/PlotComponents/PlotStandardForm.js
@@ -4,7 +4,7 @@ Ext.define(&#39;amdaUI.ColorMap&#39;, {
  
  
     data : [],
-    onChange: null,
+    onValueChange: null,
  
     constructor:function(config){
         this.getData();
@@ -37,6 +37,7 @@ Ext.define(&#39;amdaUI.ColorMap&#39;, {
             </div></tpl>',
         editable: false,
         queryMode: 'local',
+        onValueChange: config.onValueChange,
         listeners: {
             change: function (combo, newValue, oldValue, eOpts) {
                 var iconUrl="";
@@ -55,8 +56,8 @@ Ext.define(&#39;amdaUI.ColorMap&#39;, {
  
                 combo.inputEl.set({ "data-qtip": Ext.String.htmlDecode(colorName) });
  
-                if (me.onChange)
-                    me.onChange(me.name, newValue, oldValue);
+                if (me.onValueChange)
+                    me.onValueChange(me.name, newValue, oldValue);
             },
             click: {
                 element: 'el',
@@ -436,11 +436,15 @@ Ext.define(&#39;amdaPlotComp.PlotStandardForm&#39;, {
 	},
  
 	addColorMapCombo: function (name, onChange) {
+		var me = this;
 		return {
 			xtype: 'colormap',
 			name: name,
-			onChange: function(name, newValue, oldValue) {
-				this.object.set(name, newValue);
+			size: 26,
+			onValueChange: function(name, newValue, oldValue) {
+				me.object.set(name, newValue);
+				if (onChange != null)
+					onChange(name, newValue, oldValue);
 			}
 		};
 	},