commit 1c2a9685de1c5643e7f57f00bf79425056e92507
author Steven Burrows <sburrows@villa-technologies.com> Fri Jul 14 16:52:46 2017 +0100
committer Simon Hunt <simon@opennetworking.org> Mon Aug 07 18:12:46 2017 +0000
tree ff909abf0057e356a2843553a3df45581ed0f00b
parent 2e0c9c08a2ddc13cb1db0502431bc20f750c959f

GUI: Added ESLint to gulp tasks. ONOS-6521
Commented out gulp tasks making this change uneffective
Fixed an error in the build script

Change-Id: I4f4f9762aa1a66304aa74b3ab208095b9c1d4515

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

diff --git a/web/gui/src/main/webapp/app/view/topo/topoTraffic.js b/web/gui/src/main/webapp/app/view/topo/topoTraffic.js
index b4aa06a..e6b66fc 100644
--- a/web/gui/src/main/webapp/app/view/topo/topoTraffic.js
+++ b/web/gui/src/main/webapp/app/view/topo/topoTraffic.js
@@ -23,7 +23,7 @@
     'use strict';
 
     // injected refs
-    var $log, fs, flash, wss, api;
+    var $log, flash, wss, api;
 
     /*
        API to topoForce
@@ -35,12 +35,12 @@
     var allTrafficTypes = [
             'flowStatsBytes',
             'portStatsBitSec',
-            'portStatsPktSec'
+            'portStatsPktSec',
         ],
         allTrafficMsgs = [
             'Flow Stats (bytes)',
             'Port Stats (bits / second)',
-            'Port Stats (packets / second)'
+            'Port Stats (packets / second)',
         ];
 
     // internal state
@@ -49,7 +49,6 @@
         allTrafficIndex = 0;
 
 
-
     // === -----------------------------------------------------
     //  Helper functions
 
@@ -78,7 +77,7 @@
         if (api.somethingSelected()) {
             wss.sendEvent('requestDeviceLinkFlows', {
                 ids: api.selectOrder(),
-                hover: hoverValid() ? hov.id : ''
+                hover: hoverValid() ? hov.id : '',
             });
         }
     }
@@ -97,7 +96,7 @@
         if (api.somethingSelected()) {
             wss.sendEvent('requestRelatedIntents', {
                 ids: api.selectOrder(),
-                hover: hoverValid() ? hov.id : ''
+                hover: hoverValid() ? hov.id : '',
             });
         }
     }
@@ -121,19 +120,19 @@
         trafficMode = 'allFlowPort';
         hoverMode = null;
         wss.sendEvent('requestAllTraffic', {
-            trafficType: allTrafficTypes[allTrafficIndex]
+            trafficType: allTrafficTypes[allTrafficIndex],
         });
         flash.flash(allTrafficMsgs[allTrafficIndex]);
         allTrafficIndex = (allTrafficIndex + 1) % 3;
     }
 
-    function showDeviceLinkFlows () {
+    function showDeviceLinkFlows() {
         trafficMode = hoverMode = 'flows';
         requestDeviceLinkFlows();
         flash.flash('Device Flows');
     }
 
-    function showRelatedIntents () {
+    function showRelatedIntents() {
         trafficMode = hoverMode = 'intents';
         requestRelatedIntents();
         flash.flash('Related Paths');
@@ -175,25 +174,25 @@
     // === ------------------------------------------------------
     // action buttons on detail panel (multiple selection)
 
-    function addHostIntent () {
+    function addHostIntent() {
         var so = api.selectOrder();
         wss.sendEvent('addHostIntent', {
             one: so[0],
             two: so[1],
-            ids: so
+            ids: so,
         });
         trafficMode = 'intents';
         hoverMode = null;
         flash.flash('Host-to-Host flow added');
     }
 
-    function removeIntent (d) {
+    function removeIntent(d) {
         $log.debug('Entering removeIntent');
         wss.sendEvent('removeIntent', {
             appId: d.appId,
             appName: d.appName,
             key: d.key,
-            purge: d.intentPurge
+            purge: d.intentPurge,
         });
         trafficMode = 'intents';
         hoverMode = null;
@@ -201,32 +200,32 @@
         flash.flash('Intent ' + txt);
     }
 
-    function resubmitIntent (d) {
+    function resubmitIntent(d) {
         $log.debug('Entering resubmitIntent');
         wss.sendEvent('resubmitIntent', {
             appId: d.appId,
             appName: d.appName,
             key: d.key,
-            purge: d.intentPurge
+            purge: d.intentPurge,
         });
         trafficMode = 'intents';
         hoverMode = null;
         flash.flash('Intent resubmitted');
     }
 
-    function addMultiSourceIntent () {
+    function addMultiSourceIntent() {
         var so = api.selectOrder();
         wss.sendEvent('addMultiSourceIntent', {
             src: so.slice(0, so.length - 1),
             dst: so[so.length - 1],
-            ids: so
+            ids: so,
         });
         trafficMode = 'intents';
         hoverMode = null;
         flash.flash('Multi-Source flow added');
     }
 
-    function removeIntents () {
+    function removeIntents() {
         $log.debug('Entering removeIntents');
         wss.sendEvent('removeIntents', {});
         trafficMode = 'intents';
@@ -240,11 +239,10 @@
 
     angular.module('ovTopo')
     .factory('TopoTrafficService',
-        ['$log', 'FnService', 'FlashService', 'WebSocketService',
+        ['$log', 'FnService', 'WebSocketService',
 
-        function (_$log_, _fs_, _flash_, _wss_) {
+        function (_$log_, _flash_, _wss_) {
             $log = _$log_;
-            fs = _fs_;
             flash = _flash_;
             wss = _wss_;
 
@@ -271,7 +269,7 @@
                 addMultiSourceIntent: addMultiSourceIntent,
                 removeIntent: removeIntent,
                 resubmitIntent: resubmitIntent,
-                removeIntents: removeIntents
+                removeIntents: removeIntents,
             };
         }]);
 }());