Topo2: Refactored Hide, Show and Toggle methods to the ViewController
Change-Id: I63c9a0cf99f7e631a6b0000c28b637e5983c35c8
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Region.js b/web/gui/src/main/webapp/app/view/topo2/topo2Region.js
index bb8e0db..0202ca9 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Region.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Region.js
@@ -53,22 +53,26 @@
if (data.bgType === 'geo') {
t2ms.setMap({
mapid: data.bgId,
-
- // TODO: The following value will be specified in the Topo2CurrentLayout Payload
- mapfilepath: "*bayarea"
+ mapfilepath: data.bgFilePath
}).then(function () {
_.each(_this.regionNodes(), function (node) {
node.resetPosition();
});
});
- t2ms.show();
+
+ if (t2ms.enabled()) {
+ t2ms.show();
+ }
} else {
t2ms.hide();
}
if (data.bgType === 'grid') {
t2sls.loadLayout(data.bgId);
- t2sls.show();
+
+ if (t2sls.enabled()) {
+ t2sls.show();
+ }
} else {
t2sls.hide();
}