From 4342b8c724b7f468ac47266a2f6f7134f92ebbfd Mon Sep 17 00:00:00 2001
From: Nathanael Jourdane <nathanael.jourdane@irap.omp.eu>
Date: Fri, 28 Jul 2017 12:17:13 +0200
Subject: [PATCH] Fix crash when load epn-tap module from amda tree
---
js/app/controllers/EpnTapModule.js | 9 ++++++---
js/app/views/EpnTapUI.js | 6 +++++-
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/js/app/controllers/EpnTapModule.js b/js/app/controllers/EpnTapModule.js
index 73303ae..f8519f0 100644
--- a/js/app/controllers/EpnTapModule.js
+++ b/js/app/controllers/EpnTapModule.js
@@ -68,10 +68,12 @@ Ext.define('amdaDesktop.EpnTapModule', {
*** Service filter events ***
****************************/
+ /**
+ Trigerred after the a click on the "Display EPN-TAP service" item from the an AMDA tree contextual menu.
+ */
createWindow: function (icon_id) {
this.callParent();
- this.epnTapPanel.setSize(800, 600);
-
+ Ext.getCmp('epntap-win').setSize(800, 600);
var icons_dic = {
'icon-mercury': ['ts', 'planet', 'mercury'],
'icon-venus': ['ts', 'planet', 'venus'],
@@ -177,7 +179,8 @@ Ext.define('amdaDesktop.EpnTapModule', {
this.targetClassCB.disable();
this.targetClassCB.select(this.targetClassCB.getStore().getAt(0)['internalId']);
} else {
- this.targetClassCB.getStore().add({'id': 'all', 'name': this.allPrettify(productTypeDict[this.productTypeCB.value])});
+ // this.targetClassCB.getStore().add({'id': 'all', 'name': this.allPrettify(productTypeDict[this.productTypeCB.value])});
+ this.targetClassCB.getStore().add({'id': 'all', 'name': 'All'});
for (var i = 0; i < targetClasses.length; i++) {
this.targetClassCB.getStore().add({'id': targetClasses[i], 'name': this.prettify(targetClasses[i])});
}
diff --git a/js/app/views/EpnTapUI.js b/js/app/views/EpnTapUI.js
index 462d70a..70f8695 100644
--- a/js/app/views/EpnTapUI.js
+++ b/js/app/views/EpnTapUI.js
@@ -732,7 +732,11 @@ Ext.define('amdaUI.EpnTapUI', {
createServiceFilterPanel(),
createGridsPanel(),
createInfoPanel()
- ]
+ ],
+ listeners: {
+ 'beforerender': function(me) { Ext.getCmp('epntap-win').setPosition(100, 100);}
+ }
+
};
Ext.apply(this, Ext.apply(arguments, myConf));
}
--
libgit2 0.21.2