CDPP / AMDA_IHM

Commit 6191b7edd3351e7a77e4986770940167ad4e71a4

Authored by Elena.Budnik
1 parent 1d1abc4c
Exists in master and in 111 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akkodis/amdadev, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

redmine #5507+

Showing 1 changed file with 5 additions and 5 deletions   Show diff stats
Inline Side-by-side
js/app/controllers/InteropModule.js
  Diff comments   View file @6191b7e
... ... @@ -324,7 +324,7 @@ Ext.define('amdaDesktop.InteropModule', {
324 324 return result;
325 325 },
326 326  
327   - // arguments from launcher : CONFIG (OBJECT!!!)
  327 + // arguments from launcher : CONFIG (OBJECT!!!)
328 328 createWindow : function(config){
329 329 var me = this;
330 330 var baseId = null;
... ... @@ -334,7 +334,7 @@ Ext.define('amdaDesktop.InteropModule', {
334 334 var activeTab = 1;
335 335 }
336 336 else {
337   - var activeTab = ('activeTab' in config) ? config['activeTab'] : 1;
  337 + var activeTab = 'activeTab' in config ? config['activeTab'] : 1;
338 338 }
339 339 var desktop = this.app.getDesktop();
340 340 var win = desktop.getWindow(this.id);
... ... @@ -372,8 +372,8 @@ Ext.define('amdaDesktop.InteropModule', {
372 372 activeTab : activeTab,
373 373 baseId : baseId,
374 374 loadTab: function(tab) {
375   - if(tab['id'] === 'epntapTab') {
376   - me.loadEpnTap(config && 'epntapFilter' in config ? config['epntapFilter']: false);
  375 + if(tab['id'] === 'epntapTab') {
  376 + me.loadEpnTap(Ext.isObject(config) && 'epntapFilter' in config ? config['epntapFilter']: false);
377 377 }
378 378 },
379 379 onSwitchConnect : function ()
... ... @@ -383,7 +383,7 @@ Ext.define('amdaDesktop.InteropModule', {
383 383 }]
384 384 });
385 385 } else if(activeTab == 2) {
386   - me.loadEpnTap(config && 'epntapFilter' in config ? config['epntapFilter']: false);
  386 + me.loadEpnTap(Ext.isObject(config) && 'epntapFilter' in config ? config['epntapFilter']: false);
387 387 }
388 388  
389 389 if (me.samp && me.samp.ready)
... ...