GUI: Added ESLint to gulp tasks
GUI: Linted files
Fixed an error in the build script
JIRA-TASKS: ONOS-6522, ONOS-6521
Change-Id: Ie72abfe6cbe21c8946f219be6193344b67ec6dd1
diff --git a/web/gui/src/main/webapp/app/fw/widget/button.js b/web/gui/src/main/webapp/app/fw/widget/button.js
index 589b370..c0cf8ae 100644
--- a/web/gui/src/main/webapp/app/fw/widget/button.js
+++ b/web/gui/src/main/webapp/app/fw/widget/button.js
@@ -69,8 +69,8 @@
return {
id: id,
- width: buttonWidth
- }
+ width: buttonWidth,
+ };
}
@@ -111,8 +111,8 @@
width: buttonWidth,
selected: function () { return sel; },
toggle: _toggle,
- toggleNoCb: toggleNoCb
- }
+ toggleNoCb: toggleNoCb,
+ };
}
@@ -186,7 +186,7 @@
el: rbdiv,
id: rid,
cb: fs.isF(btn.cb) || noop,
- index: index
+ index: index,
});
if (btn.key) {
@@ -241,8 +241,8 @@
width: rsetWidth,
selected: selected,
selectedIndex: selectedIndex,
- size: function () { return rads.length; }
- }
+ size: function () { return rads.length; },
+ };
}
@@ -259,7 +259,7 @@
return {
button: button,
toggle: toggle,
- radioSet: radioSet
+ radioSet: radioSet,
};
}]);
diff --git a/web/gui/src/main/webapp/app/fw/widget/chartBuilder.js b/web/gui/src/main/webapp/app/fw/widget/chartBuilder.js
index e2f2959..7a48563 100644
--- a/web/gui/src/main/webapp/app/fw/widget/chartBuilder.js
+++ b/web/gui/src/main/webapp/app/fw/widget/chartBuilder.js
@@ -24,7 +24,7 @@
// fs -> FnService
// wss -> WebSocketService
// ls -> LoadingService
- var $log, $interval, $timeout, fs, wss, ls;
+ var $log, $interval, fs, wss, ls;
// constants
var refreshInterval = 2000;
@@ -129,19 +129,18 @@
angular.module('onosWidget')
.factory('ChartBuilderService',
- ['$log', '$interval', '$timeout', 'FnService', 'WebSocketService',
+ ['$log', '$interval', 'FnService', 'WebSocketService',
'LoadingService',
- function (_$log_, _$interval_, _$timeout_, _fs_, _wss_, _ls_) {
+ function (_$log_, _$interval_, _fs_, _wss_, _ls_) {
$log = _$log_;
$interval = _$interval_;
- $timeout = _$timeout_;
fs = _fs_;
wss = _wss_;
ls = _ls_;
return {
- buildChart: buildChart
+ buildChart: buildChart,
};
}]);
}());
diff --git a/web/gui/src/main/webapp/app/fw/widget/listBuilder.js b/web/gui/src/main/webapp/app/fw/widget/listBuilder.js
index edc92e9..0daa8f1 100644
--- a/web/gui/src/main/webapp/app/fw/widget/listBuilder.js
+++ b/web/gui/src/main/webapp/app/fw/widget/listBuilder.js
@@ -56,7 +56,7 @@
.factory('ListService', [
function () {
return {
- listProps: listProps
+ listProps: listProps,
};
}]);
}());
diff --git a/web/gui/src/main/webapp/app/fw/widget/table.js b/web/gui/src/main/webapp/app/fw/widget/table.js
index 343f9ba..745585f 100644
--- a/web/gui/src/main/webapp/app/fw/widget/table.js
+++ b/web/gui/src/main/webapp/app/fw/widget/table.js
@@ -94,7 +94,7 @@
s: {
first: null,
second: null,
- touched: null
+ touched: null,
},
reset: function () {
@@ -132,7 +132,7 @@
s2 = s.second;
api[s1.dir](s1.adiv);
s2 && api.none(s2.adiv);
- }
+ },
};
// Functions for sorting table rows by header
@@ -157,12 +157,12 @@
firstCol: s1.id,
firstDir: s1.dir,
secondCol: id2,
- secondDir: dir2
+ secondDir: dir2,
};
}
angular.module('onosWidget')
- .directive('onosTableResize', ['$log','$window', 'FnService', 'MastService',
+ .directive('onosTableResize', ['$log', '$window', 'FnService', 'MastService',
function (_$log_, _$window_, _fs_, _mast_) {
return function (scope, element) {
@@ -175,7 +175,7 @@
tableElems = {
table: table,
thead: table.select('.table-header').select('table'),
- tbody: table.select('.table-body').select('table')
+ tbody: table.select('.table-body').select('table'),
},
wsz;
@@ -185,7 +185,7 @@
scope.$watchCollection(function () {
return {
h: $window.innerHeight,
- w: $window.innerWidth
+ w: $window.innerWidth,
};
}, function () {
wsz = fs.windowSize(0, 30);
diff --git a/web/gui/src/main/webapp/app/fw/widget/tableBuilder.js b/web/gui/src/main/webapp/app/fw/widget/tableBuilder.js
index b23bfd0..9f1b0ab 100644
--- a/web/gui/src/main/webapp/app/fw/widget/tableBuilder.js
+++ b/web/gui/src/main/webapp/app/fw/widget/tableBuilder.js
@@ -21,7 +21,7 @@
'use strict';
// injected refs
- var $log, $interval, $timeout, fs, wss, ls;
+ var $log, $interval, fs, wss, ls;
// constants
var refreshInterval = 2000;
@@ -141,19 +141,18 @@
angular.module('onosWidget')
.factory('TableBuilderService',
- ['$log', '$interval', '$timeout', 'FnService', 'WebSocketService',
+ ['$log', '$interval', 'FnService', 'WebSocketService',
'LoadingService',
- function (_$log_, _$interval_, _$timeout_, _fs_, _wss_, _ls_) {
+ function (_$log_, _$interval_, _fs_, _wss_, _ls_) {
$log = _$log_;
$interval = _$interval_;
- $timeout = _$timeout_;
fs = _fs_;
wss = _wss_;
ls = _ls_;
return {
- buildTable: buildTable
+ buildTable: buildTable,
};
}]);
diff --git a/web/gui/src/main/webapp/app/fw/widget/tableDetail.js b/web/gui/src/main/webapp/app/fw/widget/tableDetail.js
index 57f65a7..31aac08 100644
--- a/web/gui/src/main/webapp/app/fw/widget/tableDetail.js
+++ b/web/gui/src/main/webapp/app/fw/widget/tableDetail.js
@@ -21,7 +21,7 @@
'use strict';
// injected refs
- var $log, $interval, $timeout, fs, wss;
+ var $log, fs;
// constants
// var refreshInterval = 2000;
@@ -50,17 +50,14 @@
// TODO: add ref to PanelService
angular.module('onosWidget')
.factory('TableDetailService',
- ['$log', '$interval', '$timeout', 'FnService', 'WebSocketService',
+ ['$log', 'FnService',
- function (_$log_, _$interval_, _$timeout_, _fs_, _wss_) {
+ function (_$log_, _fs_) {
$log = _$log_;
- $interval = _$interval_;
- $timeout = _$timeout_;
fs = _fs_;
- wss = _wss_;
return {
- buildBasePanel: buildBasePanel
+ buildBasePanel: buildBasePanel,
};
}]);
}());
diff --git a/web/gui/src/main/webapp/app/fw/widget/toolbar.js b/web/gui/src/main/webapp/app/fw/widget/toolbar.js
index b765208..6ac1847 100644
--- a/web/gui/src/main/webapp/app/fw/widget/toolbar.js
+++ b/web/gui/src/main/webapp/app/fw/widget/toolbar.js
@@ -38,7 +38,7 @@
top: 'auto',
bottom: '10px',
fade: false,
- shown: false
+ shown: false,
};
// internal state
@@ -81,8 +81,8 @@
panel = ps.createPanel(tbid, settings),
arrowDiv = createArrow(panel),
currentRow = panel.append('div').classed('tbar-row', true),
- rowButtonIds = [], // for removable buttons
- tbWidth = arrowSize + 2, // empty toolbar width
+ rowButtonIds = [], // for removable buttons
+ tbWidth = arrowSize + 2, // empty toolbar width
maxWidth = panel.width();
arrowDiv.on('click', toggle);
@@ -92,7 +92,7 @@
settings: settings,
items: items,
panel: panel,
- panelId: tbid
+ panelId: tbid,
};
panel.classed('toolbar', true)
@@ -171,7 +171,7 @@
clear: rowClear,
setText: rowSetText,
addButton: rowAddButton,
- classed: rowClassed
+ classed: rowClassed,
};
}
}
@@ -234,7 +234,7 @@
show: show,
hide: hide,
toggle: toggle,
- isVisible: isVisible
+ isVisible: isVisible,
};
}
@@ -268,7 +268,7 @@
return {
init: init,
createToolbar: createToolbar,
- destroyToolbar: destroyToolbar
+ destroyToolbar: destroyToolbar,
};
}]);
}());
diff --git a/web/gui/src/main/webapp/app/fw/widget/tooltip.js b/web/gui/src/main/webapp/app/fw/widget/tooltip.js
index beca6f8..4d8169c 100644
--- a/web/gui/src/main/webapp/app/fw/widget/tooltip.js
+++ b/web/gui/src/main/webapp/app/fw/widget/tooltip.js
@@ -17,12 +17,11 @@
/*
ONOS GUI -- Widget -- Tooltip Service
*/
-
(function () {
'use strict';
// injected references
- var $log, $rootScope, fs;
+ var $rootScope, fs;
// constants
var hoverHeight = 35,
@@ -45,7 +44,7 @@
style = {
display: 'inline-block',
left: 'auto',
- right: 'auto'
+ right: 'auto',
};
if (mouseX <= (winWidth / 2)) {
@@ -106,7 +105,7 @@
tooltip.transition()
.delay(exitDelay)
.style({
- display: 'none'
+ display: 'none',
})
.text('');
}
@@ -125,13 +124,12 @@
restrict: 'A',
link: function (scope, elem, attrs) {
addTooltip(d3.select(elem[0]), scope[attrs.ttMsg]);
- }
+ },
};
}])
- .factory('TooltipService', ['$log', '$rootScope', 'FnService',
- function (_$log_, _$rootScope_, _fs_) {
- $log = _$log_;
+ .factory('TooltipService', ['$rootScope', 'FnService',
+ function (_$rootScope_, _fs_) {
$rootScope = _$rootScope_;
fs = _fs_;
@@ -140,7 +138,7 @@
return {
addTooltip: addTooltip,
showTooltip: showTooltip,
- cancelTooltip: cancelTooltip
+ cancelTooltip: cancelTooltip,
};
}]);
}());