GUI -- TopoView - Minor formatting changes.
Change-Id: Ibd02437fb6f6c3d75546d29ffdb15fde801f0292
Showing
5 changed files
with
26 additions
and
27 deletions
| ... | @@ -216,7 +216,6 @@ | ... | @@ -216,7 +216,6 @@ |
| 216 | // --- Controller Definition ----------------------------------------- | 216 | // --- Controller Definition ----------------------------------------- |
| 217 | 217 | ||
| 218 | angular.module('ovTopo', moduleDependencies) | 218 | angular.module('ovTopo', moduleDependencies) |
| 219 | - | ||
| 220 | .controller('OvTopoCtrl', [ | 219 | .controller('OvTopoCtrl', [ |
| 221 | '$scope', '$log', '$location', '$timeout', | 220 | '$scope', '$log', '$location', '$timeout', |
| 222 | 'FnService', 'MastService', 'KeyService', 'ZoomService', | 221 | 'FnService', 'MastService', 'KeyService', 'ZoomService', | ... | ... |
| ... | @@ -19,7 +19,7 @@ | ... | @@ -19,7 +19,7 @@ |
| 19 | 19 | ||
| 20 | Defines the conduit between the client and the server: | 20 | Defines the conduit between the client and the server: |
| 21 | - provides a clean API for sending events to the server | 21 | - provides a clean API for sending events to the server |
| 22 | - - dispatches incoming events from the server to the appropriate submodule | 22 | + - dispatches incoming events from the server to the appropriate sub-module |
| 23 | 23 | ||
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| ... | @@ -60,34 +60,34 @@ | ... | @@ -60,34 +60,34 @@ |
| 60 | 60 | ||
| 61 | var nilApi = {}, | 61 | var nilApi = {}, |
| 62 | dispatcher = { | 62 | dispatcher = { |
| 63 | - handleEvent: function (ev) { | 63 | + handleEvent: function (ev) { |
| 64 | - var eid = ev.event, | 64 | + var eid = ev.event, |
| 65 | - api = evApis[eid] || nilApi, | 65 | + api = evApis[eid] || nilApi, |
| 66 | - eh = api[eid]; | 66 | + eh = api[eid]; |
| 67 | - | 67 | + |
| 68 | - if (eh) { | 68 | + if (eh) { |
| 69 | - $log.debug(' << *Rx* ', eid, ev.payload); | 69 | + $log.debug(' << *Rx* ', eid, ev.payload); |
| 70 | - eh(ev.payload); | 70 | + eh(ev.payload); |
| 71 | - } else { | 71 | + } else { |
| 72 | - $log.warn('Unknown event (ignored):', ev); | 72 | + $log.warn('Unknown event (ignored):', ev); |
| 73 | - } | 73 | + } |
| 74 | - }, | 74 | + }, |
| 75 | - | 75 | + |
| 76 | - sendEvent: function (evType, payload) { | 76 | + sendEvent: function (evType, payload) { |
| 77 | - if (wsock) { | 77 | + if (wsock) { |
| 78 | - $log.debug(' *Tx* >> ', evType, payload); | 78 | + $log.debug(' *Tx* >> ', evType, payload); |
| 79 | - wes.sendEvent(wsock, evType, payload); | 79 | + wes.sendEvent(wsock, evType, payload); |
| 80 | - } else { | 80 | + } else { |
| 81 | - $log.warn('sendEvent: no websocket open:', evType, payload); | 81 | + $log.warn('sendEvent: no websocket open:', evType, payload); |
| 82 | + } | ||
| 82 | } | 83 | } |
| 83 | - } | 84 | + }; |
| 84 | - }; | ||
| 85 | 85 | ||
| 86 | // === Web Socket functions === | 86 | // === Web Socket functions === |
| 87 | 87 | ||
| 88 | function onWsOpen() { | 88 | function onWsOpen() { |
| 89 | $log.debug('web socket opened...'); | 89 | $log.debug('web socket opened...'); |
| 90 | - // kick off request for periodic summary data... | 90 | + // start by requesting periodic summary data... |
| 91 | dispatcher.sendEvent('requestSummary'); | 91 | dispatcher.sendEvent('requestSummary'); |
| 92 | } | 92 | } |
| 93 | 93 | ... | ... |
| ... | @@ -355,7 +355,7 @@ | ... | @@ -355,7 +355,7 @@ |
| 355 | // Module definition | 355 | // Module definition |
| 356 | 356 | ||
| 357 | angular.module('ovTopo') | 357 | angular.module('ovTopo') |
| 358 | - .factory('TopoModelService', | 358 | + .factory('TopoModelService', |
| 359 | ['$log', 'FnService', 'RandomService', | 359 | ['$log', 'FnService', 'RandomService', |
| 360 | 360 | ||
| 361 | function (_$log_, _fs_, _rnd_) { | 361 | function (_$log_, _fs_, _rnd_) { | ... | ... |
| ... | @@ -244,7 +244,7 @@ | ... | @@ -244,7 +244,7 @@ |
| 244 | // === MODULE DEFINITION === | 244 | // === MODULE DEFINITION === |
| 245 | 245 | ||
| 246 | angular.module('ovTopo') | 246 | angular.module('ovTopo') |
| 247 | - .factory('TopoSelectService', | 247 | + .factory('TopoSelectService', |
| 248 | ['$log', 'FnService', 'FlashService', 'TopoPanelService', | 248 | ['$log', 'FnService', 'FlashService', 'TopoPanelService', |
| 249 | 'TopoTrafficService', | 249 | 'TopoTrafficService', |
| 250 | 250 | ... | ... |
| ... | @@ -199,7 +199,7 @@ | ... | @@ -199,7 +199,7 @@ |
| 199 | // === MODULE DEFINITION === | 199 | // === MODULE DEFINITION === |
| 200 | 200 | ||
| 201 | angular.module('ovTopo') | 201 | angular.module('ovTopo') |
| 202 | - .factory('TopoTrafficService', | 202 | + .factory('TopoTrafficService', |
| 203 | ['$log', 'FnService', 'FlashService', | 203 | ['$log', 'FnService', 'FlashService', |
| 204 | 204 | ||
| 205 | function (_$log_, _fs_, _flash_) { | 205 | function (_$log_, _fs_, _flash_) { | ... | ... |
-
Please register or login to post a comment