GUI -- Topo Toolbar is destroyed after view is rerouted.
Change-Id: I10085d3b8b77756fac988633dc8b930e433f81fd
diff --git a/web/gui/src/main/webapp/app/view/topo/topo.js b/web/gui/src/main/webapp/app/view/topo/topo.js
index bfcb15b..a6d54bd 100644
--- a/web/gui/src/main/webapp/app/view/topo/topo.js
+++ b/web/gui/src/main/webapp/app/view/topo/topo.js
@@ -287,6 +287,7 @@
tps.destroyPanels();
tis.destroyInst();
tfs.destroyForce();
+ ttbs.destroyToolbar();
});
// svg layer and initialization of components
diff --git a/web/gui/src/main/webapp/app/view/topo/topoToolbar.js b/web/gui/src/main/webapp/app/view/topo/topoToolbar.js
index 78dd572..377d67b 100644
--- a/web/gui/src/main/webapp/app/view/topo/topoToolbar.js
+++ b/web/gui/src/main/webapp/app/view/topo/topoToolbar.js
@@ -27,6 +27,9 @@
// internal state
var toolbar, keyData;
+ // constants
+ var name = 'topo-tbar';
+
// key to button mapping data
var k2b = {
O: { id: 'summary-tog', gid: 'summary', isel: true},
@@ -71,11 +74,15 @@
function createToolbar() {
initKeyData();
- toolbar = tbs.createToolbar('topo-tbar');
+ toolbar = tbs.createToolbar(name);
addFirstRow();
toolbar.show();
}
+ function destroyToolbar() {
+ tbs.destroyToolbar(name);
+ }
+
// allows us to ensure the button states track key strokes
function keyListener(key) {
var v = keyData.get(key);
@@ -99,6 +106,7 @@
return {
init: init,
createToolbar: createToolbar,
+ destroyToolbar: destroyToolbar,
keyListener: keyListener
};
}]);