commit c84689319e59c05de5e72bf3e42d1ce2fe7da958
author Steven Burrows <sburrows@villa-technologies.com> Fri Mar 17 16:13:41 2017 +0000
committer Simon Hunt <simon@onlab.us> Sat Mar 18 17:47:33 2017 +0000
tree 969ac4d533bbf5d92da2d0e6a1219f819f36b3f3
parent 0454d702c266ac8b654aa461b6f8903b074a0b94

Topo2: Initial re-implementation of the toolbar

Change-Id: I8376ba377dda289969500806449380d80452b8f6

web/gui/src/main/webapp/app/view/topo2/topo2.js

diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2.js b/web/gui/src/main/webapp/app/view/topo2/topo2.js
index 0022964..77d0e0c3 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2.js
@@ -98,7 +98,7 @@
         'Topo2EventService', 'Topo2ForceService', 'Topo2InstanceService',
         'Topo2BreadcrumbService', 'Topo2KeyCommandService', 'Topo2MapService',
         'Topo2MapConfigService', 'Topo2ZoomService', 'Topo2SpriteLayerService',
-        'Topo2SummaryPanelService', 'Topo2DeviceDetailsPanel',
+        'Topo2SummaryPanelService', 'Topo2DeviceDetailsPanel', 'Topo2ToolbarService',
 
         function (
             _$scope_, _$log_, _$loc_,
@@ -108,7 +108,7 @@
             _t2es_, _t2fs_, _t2is_,
             _t2bcs_, _t2kcs_, _t2ms_,
             _t2mcs_, _t2zs_, t2sls,
-            summaryPanel, detailsPanel
+            summaryPanel, detailsPanel, t2tbs
         ) {
             var params = _$loc_.search(),
                 dim,
@@ -188,10 +188,10 @@
             // make sure we can respond to topology events from the server
             t2es.bindHandlers();
 
-            t2fs.init(svg, forceG, uplink, dim, zoomer);
             t2bcs.init();
-            t2kcs.init(t2fs);
+            t2kcs.init(t2fs, t2tbs);
             t2is.initInst({ showMastership: t2fs.showMastership });
+            t2fs.init(svg, forceG, uplink, dim, zoomer);
 
             // === ORIGINAL CODE ===