diff --git a/js/app/models/InteractiveNode.js b/js/app/models/InteractiveNode.js
index e67cf06..6d0c76e 100644
--- a/js/app/models/InteractiveNode.js
+++ b/js/app/models/InteractiveNode.js
@@ -511,10 +511,6 @@ Ext.define('amdaModel.InteractiveNode', {
module.getUiContent().setTimeFromData(node.getTimeFromNode(node));
}
}
- if (node.get('needsArgs') && !node.get('isSpectra')) {
- module.getUiContent().fireEvent('openParamEditor',node.get('id'));
- }
- else {
var paramName;
var components = null;
switch (node.$className) {
@@ -533,18 +529,17 @@ Ext.define('amdaModel.InteractiveNode', {
else
paramName = node.get('id');
}
- var component_info = node.get('component_info');
- if (component_info && component_info.parentId) {
- //It's a component
- paramName = component_info.parentId;
- components = [];
- if (component_info.index1)
- components['index1'] = component_info.index1;
- if (component_info.index2)
- components['index2'] = component_info.index2;
- }
- module.addParam(paramName,true,node.get('needsArgs'),components);
- }
+// var component_info = node.get('component_info');
+// if (component_info && component_info.parentId) {
+// //It's a component
+// paramName = component_info.parentId;
+// components = [];
+// if (component_info.index1)
+// components['index1'] = component_info.index1;
+// if (component_info.index2)
+// components['index2'] = component_info.index2;
+// }
+ module.addParam(paramName,true,node.get('needsArgs'),components);
});
},
diff --git a/js/app/models/LocalParamNode.js b/js/app/models/LocalParamNode.js
index 3c842b8..d6aef31 100644
--- a/js/app/models/LocalParamNode.js
+++ b/js/app/models/LocalParamNode.js
@@ -179,16 +179,16 @@ Ext.define('amdaModel.LocalParamNode',
paramName = "#"+node.get('alias');
else
paramName = node.get('id');
- var component_info = node.get('component_info');
- if (component_info && component_info.parentId) {
- //It's a component
- paramName = component_info.parentId;
- components = [];
- if (component_info.index1)
- components['index1'] = component_info.index1;
- if (component_info.index2)
- components['index2'] = component_info.index2;
- }
+// var component_info = node.get('component_info');
+// if (component_info && component_info.parentId) {
+// //It's a component
+// paramName = component_info.parentId;
+// components = [];
+// if (component_info.index1)
+// components['index1'] = component_info.index1;
+// if (component_info.index2)
+// components['index2'] = component_info.index2;
+// }
module.addParam(paramName,true,node.get('needsArgs'),components);
});
diff --git a/js/app/models/RemoteSimuParamNode.js b/js/app/models/RemoteSimuParamNode.js
index 130e510..aa47137 100644
--- a/js/app/models/RemoteSimuParamNode.js
+++ b/js/app/models/RemoteSimuParamNode.js
@@ -10,46 +10,52 @@
Ext.define('amdaModel.RemoteSimuParamNode', {
- extend: 'amdaModel.LocalParamNode',
+ extend: 'amdaModel.LocalParamNode',
- statics:{
- nodeType: 'remoteSimuParam'
- },
+ statics:{
+ nodeType: 'remoteSimuParam'
+ },
- requires: 'amdaUI.InteropImpexUI',
-
- fields: [
- {name: 'isRemoteDataSet', type:'boolean', persist: false, defaultValue: true},
- {name: 'isSimulation', type:'boolean', defaultValue: true},
- {name: 'isAddable', type:'boolean', defaultValue: false},
- {name: 'isDeletable', type:'boolean', defaultValue: false},
- {name: 'rank', type: 'integer', persist: false, defaultValue: null}
- ],
+ requires: 'amdaUI.InteropImpexUI',
+
+ fields: [
+ {name: 'isRemoteDataSet', type:'boolean', persist: false, defaultValue: true},
+ {name: 'isSimulation', type:'boolean', defaultValue: true},
+ {name: 'isAddable', type:'boolean', defaultValue: false},
+ {name: 'isDeletable', type:'boolean', defaultValue: false},
+ {name: 'rank', type: 'integer', persist: false, defaultValue: null}
+ ],
- constructor : function(config){
- this.callParent(arguments);
- if (this.get('isParameter')) this.set('needsArgs',this.get('needsArgs'));
- if (this.get('leaf') && this.get('isSpectra')) this.set('iconCls', 'icon-spectra');
- if (this.get('disable')) {
- this.set('cls', 'icon-disabled');
- this.set('allowDrag', false);
- }
+ constructor : function(config)
+ {
+ this.callParent(arguments);
+
+ if (this.get('isParameter'))
+ this.set('needsArgs',this.get('needsArgs'));
+ if (this.get('leaf') && this.get('isSpectra'))
+ this.set('iconCls', 'icon-spectra');
+ if (this.get('disable'))
+ {
+ this.set('cls', 'icon-disabled');
+ this.set('allowDrag', false);
+ }
- if (this.get('rank')) {
- var rank = this.get('rank');
- if (rank == 1) this.set('iconCls', 'icon-mercury');
- if (rank == 2) this.set('iconCls', 'icon-venus');
- if (rank == 5) this.set('iconCls', 'icon-earth');
- if (rank == 6) this.set('iconCls', 'icon-earth');
- if (rank == 7) this.set('iconCls', 'icon-mars');
- if (rank == 8) this.set('iconCls', 'icon-jupiter');
- if (rank == 9) this.set('iconCls', 'icon-saturn');
- if (rank == 93) this.set('iconCls', 'icon-comet');
- if (rank == 3) this.set('iconCls', 'icon-sw');
- if (rank == 4) this.set('iconCls', 'icon-sw');
- if (rank >= 99) this.set('iconCls', 'icon-solarsystem');
- }
- },
+ if (this.get('rank')) {
+ var rank = this.get('rank');
+
+ if (rank == 1) this.set('iconCls', 'icon-mercury');
+ if (rank == 2) this.set('iconCls', 'icon-venus');
+ if (rank == 5) this.set('iconCls', 'icon-earth');
+ if (rank == 6) this.set('iconCls', 'icon-earth');
+ if (rank == 7) this.set('iconCls', 'icon-mars');
+ if (rank == 8) this.set('iconCls', 'icon-jupiter');
+ if (rank == 9) this.set('iconCls', 'icon-saturn');
+ if (rank == 93) this.set('iconCls', 'icon-comet');
+ if (rank == 3) this.set('iconCls', 'icon-sw');
+ if (rank == 4) this.set('iconCls', 'icon-sw');
+ if (rank >= 99) this.set('iconCls', 'icon-solarsystem');
+ }
+ },
allMenuItems : function() {
diff --git a/js/app/views/DownloadUI.js b/js/app/views/DownloadUI.js
index 64aea67..ae9bfca 100644
--- a/js/app/views/DownloadUI.js
+++ b/js/app/views/DownloadUI.js
@@ -433,16 +433,16 @@ Ext.define('amdaUI.DownloadUI', {
idToSent = data.records[0].get('id');
if (data.records[0].get('alias')!= "" )
idToSent = "#"+data.records[0].get('alias');
- var component_info = data.records[0].get('component_info');
- if (component_info && component_info.parentId) {
- //It's a component
- idToSent = component_info.parentId;
- components = [];
- if (component_info.index1)
- components['index1'] = component_info.index1;
- if (component_info.index2)
- components['index2'] = component_info.index2;
- }
+// var component_info = data.records[0].get('component_info');
+// if (component_info && component_info.parentId) {
+// //It's a component
+// idToSent = component_info.parentId;
+// components = [];
+// if (component_info.index1)
+// components['index1'] = component_info.index1;
+// if (component_info.index2)
+// components['index2'] = component_info.index2;
+// }
break;
case 'alias' :
idToSent = "#"+data.records[0].get('text');
@@ -456,7 +456,7 @@ Ext.define('amdaUI.DownloadUI', {
default :
return false;
}
- var downModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.download.id);
+ var downModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.download.id);
if (downModule)
downModule.addParam(idToSent,data.records[0].get('leaf'), data.records[0].get('needsArgs'), components);
return true;
diff --git a/js/app/views/ParameterUI.js b/js/app/views/ParameterUI.js
index 742067a..e4c0ccc 100755
--- a/js/app/views/ParameterUI.js
+++ b/js/app/views/ParameterUI.js
@@ -314,16 +314,16 @@ Ext.define('amdaUI.ParameterUI', {
nameToSent = data.records[0].get('id');
if (data.records[0].get('alias')!= "" )
var nameToSent = "#"+data.records[0].get('alias');
- var component_info = data.records[0].get('component_info');
- if (component_info && component_info.parentId) {
- //It's a component
- nameToSent = component_info.parentId;
- components = [];
- if (component_info.index1)
- components['index1'] = component_info.index1;
- if (component_info.index2)
- components['index2'] = component_info.index2;
- }
+// var component_info = data.records[0].get('component_info');
+// if (component_info && component_info.parentId) {
+// //It's a component
+// nameToSent = component_info.parentId;
+// components = [];
+// if (component_info.index1)
+// components['index1'] = component_info.index1;
+// if (component_info.index2)
+// components['index2'] = component_info.index2;
+// }
break;
case 'alias' :
nameToSent = "#"+data.records[0].get('text');
diff --git a/js/app/views/SearchUI.js b/js/app/views/SearchUI.js
index d0612a0..9d43de3 100755
--- a/js/app/views/SearchUI.js
+++ b/js/app/views/SearchUI.js
@@ -356,16 +356,17 @@ Ext.define('amdaUI.SearchUI', {
nameToSent = data.records[0].get('id');
if (data.records[0].get('alias')!= "" )
nameToSent = "#"+data.records[0].get('alias');
- var component_info = data.records[0].get('component_info');
- if (component_info && component_info.parentId) {
- //It's a component
- nameToSent = component_info.parentId;
- components = [];
- if (component_info.index1)
- components['index1'] = component_info.index1;
- if (component_info.index2)
- components['index2'] = component_info.index2;
- }
+// var component_info = data.records[0].get('component_info');
+// if (component_info && component_info.parentId) {
+// if ( component_info.index1 && component_info.index2 ){
+// nameToSent = component_info.parentId;
+// components = [];
+// if (component_info.index1)
+// components['index1'] = component_info.index1;
+// if (component_info.index2)
+// components['index2'] = component_info.index2;
+// }
+// }
break;
case 'alias' :
nameToSent = "#"+data.records[0].get('text');
--
libgit2 0.21.2