Topo2: Bug fixes
1: port lables not showing on mouseover
2: D3 Errors when there are no topology errors and a user pans/zooms
Change-Id: Ic65ba393d23b60673c3a731d1986ee15bbe1bd88
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Force.js b/web/gui/src/main/webapp/app/view/topo2/topo2Force.js
index 1c2ea67..0e93868 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Force.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Force.js
@@ -34,16 +34,18 @@
// ========================== Helper Functions
- function init(_svg_, _forceG_, _uplink_, _dim_, zoomer, _opts_) {
+ function init(_svg_, _forceG_, _uplink_, _dim_, _zoomer_, _opts_) {
+
svg = _svg_;
- forceG = _forceG_;
uplink = _uplink_;
dim = _dim_;
+ zoomer = _zoomer_;
opts = _opts_;
- t2bcs.addLayout(t2ls);
+
t2bgs.init();
- t2ls = t2ls(svg, forceG, uplink, dim, zoomer, opts);
+ t2ls.init(svg, uplink, dim, zoomer, opts);
+ t2bcs.addLayout(t2ls);
t2rs.layout = t2ls;
t2ss.init(svg, zoomer);
}