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
diff --git a/web/gui/src/main/webapp/app/view/topo/topoD3.js b/web/gui/src/main/webapp/app/view/topo/topoD3.js
index 5496abc..6146082 100644
--- a/web/gui/src/main/webapp/app/view/topo/topoD3.js
+++ b/web/gui/src/main/webapp/app/view/topo/topoD3.js
@@ -23,7 +23,7 @@
'use strict';
// injected refs
- var $log, fs, sus, is, ts, ps, ttbs;
+ var sus, is, ts, ps, ttbs;
// api to topoForce
var zoomer, api;
@@ -46,7 +46,7 @@
badgeConfig = {
radius: 12,
yoff: 5,
- gdelta: 10
+ gdelta: 10,
},
halfDevIcon = devIconDim / 2,
devBadgeOff = { dx: -halfDevIcon, dy: -halfDevIcon },
@@ -55,7 +55,7 @@
status = {
i: 'badgeInfo',
w: 'badgeWarn',
- e: 'badgeError'
+ e: 'badgeError',
};
// NOTE: this type of hack should go away once we have implemented
@@ -77,7 +77,7 @@
var remappedHostTypes = {
router: 'm_router',
endstation: 'm_endstation',
- bgpSpeaker: 'm_bgpSpeaker'
+ bgpSpeaker: 'm_bgpSpeaker',
};
function mapDeviceTypeToGlyph(type) {
@@ -100,13 +100,13 @@
var dColTheme = {
light: {
online: '#444444',
- offline: '#cccccc'
+ offline: '#cccccc',
},
dark: {
// TODO: theme
online: '#444444',
- offline: '#cccccc'
- }
+ offline: '#cccccc',
+ },
};
function devGlyphColor(d) {
@@ -119,13 +119,13 @@
function setDeviceColor(d) {
// want to color the square rectangle (no longer the 'use' glyph)
- d.el.selectAll('rect').filter(function (d, i) {return i === 1;})
+ d.el.selectAll('rect').filter(function (d, i) { return i === 1; })
.style('fill', devGlyphColor(d));
}
function incDevLabIndex() {
setDevLabIndex(deviceLabelIndex+1);
- switch(deviceLabelIndex) {
+ switch (deviceLabelIndex) {
case 0: return 'Hide device labels';
case 1: return 'Show friendly device labels';
case 2: return 'Show device ID labels';
@@ -141,7 +141,7 @@
function incHostLabIndex() {
setHostLabIndex(hostLabelIndex+1);
- switch(hostLabelIndex) {
+ switch (hostLabelIndex) {
case 0: return 'Show friendly host labels';
case 1: return 'Show host IP Addresses';
case 2: return 'Show host MAC Addresses';
@@ -180,8 +180,8 @@
x: -dim/2,
y: -dim/2,
width: dim + labelWidth,
- height: dim
- }
+ height: dim,
+ };
}
function updateDeviceRendering(d) {
@@ -239,7 +239,7 @@
width: bcgd * 2,
height: bcgd * 2,
transform: sus.translate(-bcgd, -bcgd),
- 'xlink:href': '#' + bdg.gid
+ 'xlink:href': '#' + bdg.gid,
});
}
}
@@ -279,14 +279,14 @@
var node = d3.select(this),
glyphId = mapDeviceTypeToGlyph(d.type),
label = trimLabel(deviceLabel(d)),
- rect, crect, text, glyph, labelWidth;
+ rect, crect, glyph, labelWidth;
d.el = node;
rect = node.append('rect');
crect = node.append('rect');
- text = node.append('text').text(label)
+ node.append('text').text(label)
.attr('text-anchor', 'left')
.attr('y', '0.3em')
.attr('x', halfDevIcon + labelPad);
@@ -462,13 +462,13 @@
});
if (idx === -1) {
- labels.push({id: newId, x: newX, y: newY});
+ labels.push({ id: newId, x: newX, y: newY });
} else {
- labels[idx] = {id: newId, x: newX, y: newY};
+ labels[idx] = { id: newId, x: newX, y: newY };
}
- return {x: newX, y: newY};
- }
+ return { x: newX, y: newY };
+ };
}
var getLabelPos = generateLabelFunction();
@@ -518,7 +518,7 @@
return {
x: movedX,
- y: movedY
+ y: movedY,
};
}
@@ -545,7 +545,7 @@
x2: mid.x + moveAmtX,
y2: mid.y + moveAmtY,
stroke: api.linkConfig()[ts.theme()].baseColor,
- transform: 'rotate(' + angle + ',' + mid.x + ',' + mid.y + ')'
+ transform: 'rotate(' + angle + ',' + mid.x + ',' + mid.y + ')',
};
}
@@ -554,7 +554,7 @@
dist = 20;
return {
x: point.x + dist,
- y: point.y + dist
+ y: point.y + dist,
};
}
@@ -568,7 +568,7 @@
var el = d3.select(this);
el.attr({
- transform: function (d) { return calcGroupPos(d.linkCoords); }
+ transform: function (d) { return calcGroupPos(d.linkCoords); },
});
el.select('line')
.attr(hashAttrs(d.linkCoords));
@@ -583,7 +583,7 @@
.append('g')
.attr({
transform: function (d) { return calcGroupPos(d.linkCoords); },
- id: function (d) { return 'pair-' + d.id; }
+ id: function (d) { return 'pair-' + d.id; },
})
.classed('numLinkLabel', true);
@@ -608,12 +608,10 @@
angular.module('ovTopo')
.factory('TopoD3Service',
- ['$log', 'FnService', 'SvgUtilService', 'IconService', 'ThemeService',
+ ['SvgUtilService', 'IconService', 'ThemeService',
'PrefsService', 'TopoToolbarService',
- function (_$log_, _fs_, _sus_, _is_, _ts_, _ps_, _ttbs_) {
- $log = _$log_;
- fs = _fs_;
+ function (_sus_, _is_, _ts_, _ps_, _ttbs_) {
sus = _sus_;
is = _is_;
ts = _ts_;
@@ -654,7 +652,7 @@
applyLinkLabels: applyLinkLabels,
transformLabel: transformLabel,
applyPortLabels: applyPortLabels,
- applyNumLinkLabels: applyNumLinkLabels
+ applyNumLinkLabels: applyNumLinkLabels,
};
}]);
}());