commit 237676b53d706a26d2ba42043918fa3442357c1f
author Simon Hunt <simon@onlab.us> Tue Mar 10 19:04:26 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Wed Mar 11 02:22:05 2015 +0000
tree ee326db87d9002ebf3b66a9e2f44ac2babfc6f26
parent c24cde3305be1fbc6b25caf69a9f1aadbbf1c8da

GUI -- Topo - rewired modules to call wss.sendEvent(...) directly.

Change-Id: I9077694895b814c6dc342a518948e05e0cc2df01

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

diff --git a/web/gui/src/main/webapp/app/view/topo/topoSelect.js b/web/gui/src/main/webapp/app/view/topo/topoSelect.js
index 2f1dd15..af0e041 100644
--- a/web/gui/src/main/webapp/app/view/topo/topoSelect.js
+++ b/web/gui/src/main/webapp/app/view/topo/topoSelect.js
@@ -23,7 +23,7 @@
     'use strict';
 
     // injected refs
-    var $log, fs, flash, tps, tts;
+    var $log, fs, flash, wss, tps, tts;
 
     // api to topoForce
     var api;
@@ -31,7 +31,6 @@
        node()                         // get ref to D3 selection of nodes
        zoomingOrPanning( ev )
        updateDeviceColors( [dev] )
-       sendEvent( type, {payload} )
      */
 
     // internal state
@@ -143,7 +142,7 @@
 
     function requestDetails() {
         var data = getSel(0).obj;
-        api.sendEvent('requestDetails', {
+        wss.sendEvent('requestDetails', {
             id: data.id,
             class: data.class
         });
@@ -245,13 +244,14 @@
 
     angular.module('ovTopo')
     .factory('TopoSelectService',
-        ['$log', 'FnService', 'FlashService', 'TopoPanelService',
-            'TopoTrafficService',
+        ['$log', 'FnService', 'FlashService', 'WebSocketService',
+            'TopoPanelService', 'TopoTrafficService',
 
-        function (_$log_, _fs_, _flash_, _tps_, _tts_) {
+        function (_$log_, _fs_, _flash_, _wss_, _tps_, _tts_) {
             $log = _$log_;
             fs = _fs_;
             flash = _flash_;
+            wss = _wss_;
             tps = _tps_;
             tts = _tts_;