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

diff --git a/web/gui/src/main/webapp/app/view/topo/topoToolbar.js b/web/gui/src/main/webapp/app/view/topo/topoToolbar.js
index 76af3d7..e9d9752 100644
--- a/web/gui/src/main/webapp/app/view/topo/topoToolbar.js
+++ b/web/gui/src/main/webapp/app/view/topo/topoToolbar.js
@@ -42,7 +42,7 @@
 
     // key to button mapping data
     var k2b = {
-        O: { id: 'summary-tog', gid: 'm_summary', isel: true},
+        O: { id: 'summary-tog', gid: 'm_summary', isel: true },
         I: { id: 'instance-tog', gid: 'm_uiAttached', isel: true },
         D: { id: 'details-tog', gid: 'm_details', isel: true },
         H: { id: 'hosts-tog', gid: 'm_endstation', isel: false },
@@ -57,12 +57,12 @@
         L: { id: 'cycleLabels-btn', gid: 'm_cycleLabels' },
         R: { id: 'resetZoom-btn', gid: 'm_resetZoom' },
 
-        E: { id: 'eqMaster-btn', gid: 'm_eqMaster' }
+        E: { id: 'eqMaster-btn', gid: 'm_eqMaster' },
     };
 
     var prohibited = [
         'T', 'backSlash', 'slash',
-        'X' // needed until we re-instate X above.
+        'X', // needed until we re-instate X above.
     ];
     prohibited = prohibited.concat(d3.map(k2b).keys());
 
@@ -79,8 +79,8 @@
             porthl: 1,
             bg: 0,
             spr: 0,
-            ovid: 'traffic',   // default to traffic overlay
-            toolbar: 0
+            ovid: 'traffic', // default to traffic overlay
+            toolbar: 0,
         },
         prefsMap = {
             summary: 'O',
@@ -90,7 +90,7 @@
             offdev: 'M',
             porthl: 'P',
             bg: 'B',
-            spr: 'S'
+            spr: 'S',
             // NOTE: toolbar state is handled separately
         };
 
@@ -125,12 +125,11 @@
     function initKeyData() {
         // TODO: use angular forEach instead of d3.map
         keyData = d3.map(k2b);
-        keyData.forEach(function(key, value) {
+        keyData.forEach(function (key, value) {
             var data = api.getActionEntry(key);
-
             value.key = key;
-            value.cb = data[0];     // on-click callback
-            value.tt = data[1];     // tooltip (may be a function)
+            value.cb = data[0]; // on-click callback
+            value.tt = data[1] + ' (' + key + ')'; // tooltip
         });
     }
 
@@ -172,7 +171,7 @@
     }
 
     function addSecondRow() {
-        //addToggle('X');
+        // addToggle('X');
         addToggle('Z');
         addButton('N');
         addButton('L');
@@ -190,7 +189,7 @@
                 tooltip: 'No Overlay',
                 cb: function () {
                     tov.tbSelection(null, switchOverlayActions);
-                }
+                },
             }];
         ovIndex = tov.augmentRbset(rset, switchOverlayActions);
         ovRset = toolbar.addRadioSet('topo-overlays', rset);
@@ -331,7 +330,7 @@
                 toggleToolbar: toggleToolbar,
                 selectOverlay: selectOverlay,
                 defaultPrefs: defaultPrefsState,
-                fnkey: fnkey
+                fnkey: fnkey,
             };
         }]);
-}());
\ No newline at end of file
+}());