Merge branch 'amdadev_test' into FER_CR42

Erdogan Furkan
2 parents deb35db7 b350c87a
Showing 2 changed files with 8 additions and 3 deletions Show diff stats
js/app/views/ColorMap.js
js/app/views/PlotComponents/PlotStandardForm.js
@@ -21,11 +21,15 @@ Ext.define(&#39;amdaUI.ColorMap&#39;, {
     init: function(config){
         var me = this;
         var size = (typeof config !== "undefined" && config.size) ? config.size : '12';
+        var hideFieldLabel = true;
+        if (typeof config !== "undefined") {
+            hideFieldLabel = (config.hideFieldLabel !== false);
+        }
         Ext.apply(this,{
             xtype:'combobox',
             name: (typeof config !== "undefined" && config.name) ? config.name:null,
-            fieldLabel: 'Color Map&nbsp;<img amda_clicktip="colourMaps" style="vertical-align:bottom" src="js/resources/images/16x16/info_mini.png"',
-        store: new Ext.data.Store({
+            fieldLabel: hideFieldLabel ? '' : 'Color Map&nbsp;<img amda_clicktip="colourMaps" style="vertical-align:bottom" src="js/resources/images/16x16/info_mini.png"',
+            store: new Ext.data.Store({
             fields: ['key','name', 'iconUrl'],
             data: me.data
         }),
@@ -37,7 +41,7 @@ Ext.define(&#39;amdaUI.ColorMap&#39;, {
             </div></tpl>',
         editable: false,
         queryMode: 'local',
-        onValueChange: config.onValueChange,
+        onValueChange: (typeof config !== "undefined" && config.onValueChange) ? config.onValueChange : null,
         listeners: {
             change: function (combo, newValue, oldValue, eOpts) {
                 var iconUrl="";
@@ -441,6 +441,7 @@ Ext.define(&#39;amdaPlotComp.PlotStandardForm&#39;, {
 			xtype: 'colormap',
 			name: name,
 			size: 26,
+			hideFieldLabel: false,
 			onValueChange: function(name, newValue, oldValue) {
 				me.object.set(name, newValue);
 				if (onChange != null)