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/topo2Force.js

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 fc3e5b739..89fbae4 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Force.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Force.js
@@ -25,7 +25,7 @@
     // injected refs
     var $log, $loc, wss;
 
-    var t2is, t2rs, t2ls, t2vs, t2bcs, t2ss, t2bgs;
+    var t2is, t2rs, t2ls, t2vs, t2bcs, t2ss, t2bgs, t2tbs;
     var svg, forceG, uplink, dim, opts, zoomer;
 
     // D3 Selections
@@ -49,11 +49,12 @@
         t2ss.init(svg, zoomer);
         t2ss.region = t2rs;
         t2rs.layout = t2ls;
-
+        t2tbs.init();
         navToBookmarkedRegion($loc.search().regionId);
     }
 
     function destroy() {
+        t2tbs.destroy();
         $log.debug('Destroy topo force layout');
     }
 
@@ -188,9 +189,9 @@
         '$log', '$location', 'WebSocketService', 'Topo2InstanceService',
         'Topo2RegionService', 'Topo2LayoutService', 'Topo2ViewService',
         'Topo2BreadcrumbService', 'Topo2ZoomService', 'Topo2SelectService',
-        'Topo2BackgroundService',
+        'Topo2BackgroundService', 'Topo2ToolbarService',
         function (_$log_, _$loc_, _wss_, _t2is_, _t2rs_, _t2ls_,
-            _t2vs_, _t2bcs_, zoomService, _t2ss_, _t2bgs_) {
+            _t2vs_, _t2bcs_, zoomService, _t2ss_, _t2bgs_, _t2tbs_) {
 
             $log = _$log_;
             $loc = _$loc_;
@@ -202,6 +203,7 @@
             t2bcs = _t2bcs_;
             t2ss = _t2ss_;
             t2bgs = _t2bgs_;
+            t2tbs = _t2tbs_;
 
             var onZoom = function () {
                 var nodes = [].concat(