diff --git a/js/app/controllers/InteropModule.js b/js/app/controllers/InteropModule.js index e93fa36..b748677 100644 --- a/js/app/controllers/InteropModule.js +++ b/js/app/controllers/InteropModule.js @@ -324,7 +324,7 @@ Ext.define('amdaDesktop.InteropModule', { return result; }, - // arguments from launcher : CONFIG (OBJECT!!!) + // arguments from launcher : CONFIG (OBJECT!!!) createWindow : function(config){ var me = this; var baseId = null; @@ -334,7 +334,7 @@ Ext.define('amdaDesktop.InteropModule', { var activeTab = 1; } else { - var activeTab = ('activeTab' in config) ? config['activeTab'] : 1; + var activeTab = 'activeTab' in config ? config['activeTab'] : 1; } var desktop = this.app.getDesktop(); var win = desktop.getWindow(this.id); @@ -372,8 +372,8 @@ Ext.define('amdaDesktop.InteropModule', { activeTab : activeTab, baseId : baseId, loadTab: function(tab) { - if(tab['id'] === 'epntapTab') { - me.loadEpnTap(config && 'epntapFilter' in config ? config['epntapFilter']: false); + if(tab['id'] === 'epntapTab') { + me.loadEpnTap(Ext.isObject(config) && 'epntapFilter' in config ? config['epntapFilter']: false); } }, onSwitchConnect : function () @@ -383,7 +383,7 @@ Ext.define('amdaDesktop.InteropModule', { }] }); } else if(activeTab == 2) { - me.loadEpnTap(config && 'epntapFilter' in config ? config['epntapFilter']: false); + me.loadEpnTap(Ext.isObject(config) && 'epntapFilter' in config ? config['epntapFilter']: false); } if (me.samp && me.samp.ready) -- libgit2 0.21.2