commit 20207dfca72f13bd9451f1f8d8e64611b537d630
author Simon Hunt <simon@onlab.us> Tue Mar 10 18:30:14 2015 -0700
committer Simon Hunt <simon@onlab.us> Tue Mar 10 18:30:23 2015 -0700
tree 76ce1eb0b9568e29ab7be9a90f89df4492a12967
parent 13f896f1cf5184ceb038919ed56f0a6d6b0f4d22

GUI -- Cleaned up websocket code.
 - isolated new WebSocket() call, so we can mock.

Change-Id: Id1225e2c65732e750b289224e838a326c79f02a4

web/gui/src/main/webapp/app/view/topo/topoEvent.js

diff --git a/web/gui/src/main/webapp/app/view/topo/topoEvent.js b/web/gui/src/main/webapp/app/view/topo/topoEvent.js
index 10b6909..e7f29d3 100644
--- a/web/gui/src/main/webapp/app/view/topo/topoEvent.js
+++ b/web/gui/src/main/webapp/app/view/topo/topoEvent.js
@@ -27,15 +27,15 @@
     'use strict';
 
     // injected refs
-    var $log, vs, wss, tps, tis, tfs, tss, tts;
+    var $log, wss, tps, tis, tfs, tss, tts;
 
     // internal state
-    var handlers;
+    var handlerMap;
 
     // ==========================
 
-    function createHandlers() {
-        handlers = {
+    function createHandlerMap() {
+        handlerMap = {
             showSummary: tps,
 
             showDetails: tss,
@@ -58,17 +58,14 @@
         };
     }
 
-    var nilApi = {};
-
     angular.module('ovTopo')
     .factory('TopoEventService',
-        ['$log', '$location', 'VeilService', 'WebSocketService',
+        ['$log', '$location', 'WebSocketService',
             'TopoPanelService', 'TopoInstService', 'TopoForceService',
             'TopoSelectService', 'TopoTrafficService',
 
-        function (_$log_, $loc, _vs_, _wss_, _tps_, _tis_, _tfs_, _tss_, _tts_) {
+        function (_$log_, $loc, _wss_, _tps_, _tis_, _tfs_, _tss_, _tts_) {
             $log = _$log_;
-            vs = _vs_;
             wss = _wss_;
             tps = _tps_;
             tis = _tis_;
@@ -76,18 +73,18 @@
             tss = _tss_;
             tts = _tts_;
 
-            createHandlers();
+            createHandlerMap();
 
-            // FIXME: need to handle async socket open to avoid race
             function start() {
-                wss.bindHandlers(handlers);
+                wss.bindHandlers(handlerMap);
                 wss.sendEvent('topoStart');
+                wss.sendEvent('requestSummary');
                 $log.debug('topo comms started');
             }
 
             function stop() {
-                wss.unbindHandlers();
                 wss.sendEvent('topoStop');
+                wss.unbindHandlers(handlerMap);
                 $log.debug('topo comms stopped');
             }