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/view/topo2/topo2.js b/web/gui/src/main/webapp/app/view/topo2/topo2.js
index db64e14..95082f1 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2.js
@@ -22,10 +22,10 @@
(function () {
'use strict';
-
+
// references to injected services
var $scope, $log, fs, mast, ks, wss,
- gs, sus, ps, t2es, t2fs, t2is, t2bcs, t2kcs, t2ms, t2mcs, t2zs;
+ gs, sus, t2es, t2fs, t2is, t2bcs, t2kcs, t2ms, t2zs;
// DOM elements
var ovtopo2, svg, defs, zoomLayer, forceG;
@@ -59,11 +59,11 @@
var sc = zoomer.scale(),
tr = zoomer.translate(),
metaUi = isNaN(sc) ? {
- useCfg: 1
+ useCfg: 1,
} : {
scale: sc,
offsetX: tr[0],
- offsetY: tr[1]
+ offsetY: tr[1],
};
// Allow map service to react to change in zoom parameters
@@ -74,7 +74,7 @@
wss.sendEvent('updateMeta2', {
id: 'layoutZoom',
- memento: metaUi
+ memento: metaUi,
});
}
@@ -85,7 +85,7 @@
svg: svg,
zoomLayer: zoomLayer,
zoomEnabled: zoomEnabled,
- zoomCallback: zoomCallback
+ zoomCallback: zoomCallback,
});
}
@@ -95,22 +95,20 @@
.controller('OvTopo2Ctrl', [
'$scope', '$log', '$location',
'FnService', 'MastService', 'KeyService', 'GlyphService', 'MapService',
- 'SvgUtilService', 'FlashService', 'WebSocketService',
- 'PrefsService', 'ThemeService',
+ 'SvgUtilService', 'FlashService', 'WebSocketService', 'ThemeService',
'Topo2EventService', 'Topo2ForceService', 'Topo2InstanceService',
'Topo2BreadcrumbService', 'Topo2KeyCommandService', 'Topo2MapService',
- 'Topo2MapConfigService', 'Topo2ZoomService', 'Topo2SpriteLayerService',
+ 'Topo2ZoomService', 'Topo2SpriteLayerService',
'Topo2SummaryPanelService', 'Topo2DeviceDetailsPanel', 'Topo2ToolbarService',
'Topo2NoDevicesConnectedService', 'Topo2OverlayService',
function (
_$scope_, _$log_, _$loc_,
_fs_, _mast_, _ks_, _gs_, _ms_,
- _sus_, _flash_, _wss_,
- _ps_, _th_,
+ _sus_, _flash_, _wss_, _th_,
_t2es_, _t2fs_, _t2is_,
_t2bcs_, _t2kcs_, _t2ms_,
- _t2mcs_, _t2zs_, t2sls,
+ _t2zs_, t2sls,
summaryPanel, detailsPanel, t2tbs, t2ndcs, t2os
) {
var params = _$loc_.search(),
@@ -118,7 +116,7 @@
wh,
uplink = {
zoomLayer: function () { return zoomLayer; },
- zoomer: function () { return zoomer; }
+ zoomer: function () { return zoomer; },
};
$scope = _$scope_;
@@ -130,7 +128,6 @@
wss = _wss_;
gs = _gs_;
sus = _sus_;
- ps = _ps_;
t2es = _t2es_;
t2fs = _t2fs_;
@@ -138,7 +135,6 @@
t2bcs = _t2bcs_;
t2kcs = _t2kcs_;
t2ms = _t2ms_;
- t2mcs = _t2mcs_;
t2zs = _t2zs_;
// capture selected intent parameters (if they are set in the
@@ -152,7 +148,7 @@
key: params.intentKey,
appId: params.intentAppId,
appName: params.intentAppName,
- intentType: params.intentType
+ intentType: params.intentType,
};
}
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Background.js b/web/gui/src/main/webapp/app/view/topo2/topo2Background.js
index 902ebdc..127ba86 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Background.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Background.js
@@ -116,10 +116,10 @@
resetZoom: function () {
var pan = zoomPan(this.zoomData, true);
t2zs.panAndZoom(pan, zoomScale(this.zoomData, true), 1000);
- }
+ },
});
return instance || new BackgroundView();
- }
+ },
]);
-})();
\ No newline at end of file
+})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Badge.js b/web/gui/src/main/webapp/app/view/topo2/topo2Badge.js
index 429627e..e602aab 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Badge.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Badge.js
@@ -20,4 +20,4 @@
usage: new NodeBadge({text, icon}, DOM Element, Node);
*/
-// TODO: Create a badge class
\ No newline at end of file
+// TODO: Create a badge class
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Breadcrumb.js b/web/gui/src/main/webapp/app/view/topo2/topo2Breadcrumb.js
index d2a1391..3ff7932 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Breadcrumb.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Breadcrumb.js
@@ -23,12 +23,11 @@
'use strict';
- var $log, $loc, wss, t2rns;
+ var t2rns;
// Internal
var breadcrumbContainer,
- breadcrumbs,
- layout;
+ breadcrumbs;
function init() {
breadcrumbs = [];
@@ -96,27 +95,21 @@
});
}
- function addLayout(_layout_) {
- layout = _layout_;
- }
+ // TODO: Remove references
+ function addLayout(_layout_) {}
angular.module('ovTopo2')
.factory('Topo2BreadcrumbService', [
- '$log', '$location', 'WebSocketService',
'Topo2RegionNavigationService',
- function (_$log_, _$loc_, _wss_, _t2rns_) {
-
- $log = _$log_;
- $loc = _$loc_;
- wss = _wss_;
+ function (_t2rns_) {
t2rns = _t2rns_;
return {
init: init,
addBreadcrumb: addBreadcrumb,
addLayout: addLayout,
- hide: hide
+ hide: hide,
};
- }
+ },
]);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Collection.js b/web/gui/src/main/webapp/app/view/topo2/topo2Collection.js
index 3218988..f4790bd 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Collection.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Collection.js
@@ -116,7 +116,7 @@
return this.models.map(function (model) {
return model.toJSON(options);
});
- }
+ },
};
angular.module('ovTopo2')
@@ -126,7 +126,7 @@
Collection.extend = fn.extend;
Model = _Model_;
return Collection;
- }
+ },
]);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2DetailsPanel.js b/web/gui/src/main/webapp/app/view/topo2/topo2DetailsPanel.js
index fd55a08..9ed6a0e 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2DetailsPanel.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2DetailsPanel.js
@@ -43,7 +43,7 @@
panelPadding = 64,
panelSpacing = 20,
panelOpts = {
- width: 260 // summary and detail panel width
+ width: 260, // summary and detail panel width
};
function getInstance(_summaryPanel_) {
@@ -54,7 +54,7 @@
summaryPanel = _summaryPanel_;
var options = angular.extend({}, panelOpts, {
- class: className
+ class: className,
});
Panel = Panel.extend({
@@ -84,7 +84,7 @@
detailsPanel.el.el()
.style('top', panelPadding + position + 'px');
detailsPanel.el.show();
- }
+ },
});
detailsPanel = new Panel(id, options);
@@ -94,7 +94,6 @@
}
-
angular.module('ovTopo2')
.factory('Topo2DetailsPanelService', [
'Topo2PanelService',
@@ -102,6 +101,6 @@
Panel = _ps_;
return getInstance;
- }
+ },
]);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Device.js b/web/gui/src/main/webapp/app/view/topo2/topo2Device.js
index 8f7edd9..ae8ebd9 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Device.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Device.js
@@ -26,13 +26,13 @@
var remappedDeviceTypes = {
switch: 'm_switch',
- virtual: 'cord'
+ virtual: 'cord',
};
function createDeviceCollection(data) {
var DeviceCollection = Collection.extend({
- model: Model
+ model: Model,
});
var devices = [];
@@ -58,7 +58,7 @@
nodeType: 'device',
multiSelectEnabled: true,
events: {
- 'click': 'onClick'
+ 'click': 'onClick',
},
initialize: function () {
@@ -88,7 +88,7 @@
var id = this.mastershipService.mastership(),
suppress = id ? this.get('master') !== id : false;
- this.set({mastership: suppress});
+ this.set({ mastership: suppress });
},
setOfflineVisibility: function () {
var showOffline = ps.getPrefs('topo2_prefs')['offline_devices'],
@@ -107,13 +107,13 @@
.style('stroke-fill', '#555')
.style('fill', '#888')
.style('opacity', 0.5);
- }
+ },
});
return {
- createDeviceCollection: createDeviceCollection
+ createDeviceCollection: createDeviceCollection,
};
- }
+ },
]);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2DeviceDetailsPanel.js b/web/gui/src/main/webapp/app/view/topo2/topo2DeviceDetailsPanel.js
index 3cacf8b..1ff054c 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2DeviceDetailsPanel.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2DeviceDetailsPanel.js
@@ -32,35 +32,35 @@
var id = 'topo2-p-detail',
devicePath = 'device',
handlerMap = {
- 'showDetails': showDetails
+ 'showDetails': showDetails,
};
var coreButtons = {
showDeviceView: {
gid: 'switch',
tt: 'Show Device View',
- path: 'device'
+ path: 'device',
},
showFlowView: {
gid: 'flowTable',
tt: 'Show Flow View for this Device',
- path: 'flow'
+ path: 'flow',
},
showPortView: {
gid: 'portTable',
tt: 'Show Port View for this Device',
- path: 'port'
+ path: 'port',
},
showGroupView: {
gid: 'groupTable',
tt: 'Show Group View for this Device',
- path: 'group'
+ path: 'group',
},
showMeterView: {
gid: 'meterTable',
tt: 'Show Meter View for this Device',
- path: 'meter'
- }
+ path: 'meter',
+ },
};
function init(summaryPanel) {
@@ -94,7 +94,7 @@
id: 'core-' + id,
gid: gid,
tt: tt,
- cb: function () { ns.navTo(path, { devId: devId }); }
+ cb: function () { ns.navTo(path, { devId: devId }); },
});
}
});
@@ -168,7 +168,7 @@
function updateDetails(id, nodeType) {
wss.sendEvent('requestDetails', {
id: id,
- class: nodeType
+ class: nodeType,
});
}
@@ -223,8 +223,8 @@
hide: hide,
destroy: destroy,
isVisible: function () { return detailsPanel.isVisible(); },
- getInstance: function () { return detailsPanel; }
+ getInstance: function () { return detailsPanel; },
};
- }
+ },
]);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Event.js b/web/gui/src/main/webapp/app/view/topo2/topo2Event.js
index e8b8eac..fc245f4 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Event.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Event.js
@@ -98,7 +98,7 @@
return {
bindHandlers: bindHandlers,
start: start,
- stop: stop
+ stop: stop,
};
}]);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Force.js b/web/gui/src/main/webapp/app/view/topo2/topo2Force.js
index b18ff32..c75935e 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Force.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Force.js
@@ -26,10 +26,7 @@
var $log, $loc, wss;
var t2is, t2rs, t2ls, t2vs, t2bcs, t2ss, t2bgs, t2tbs, t2mss;
- var svg, forceG, uplink, dim, opts, zoomer;
-
- // D3 Selections
- var node;
+ var svg, uplink, dim, opts, zoomer;
// ========================== Helper Functions
@@ -63,7 +60,7 @@
$log.debug('navToBookmarkedRegion:', regionId);
if (regionId) {
wss.sendEvent('topo2navRegion', {
- rid: regionId
+ rid: regionId,
});
t2ls.createForceElements();
@@ -223,7 +220,7 @@
updateNodes: updateNodes,
updateLinks: updateLinks,
resetNodeLocation: resetNodeLocation,
- unpin: unpin
+ unpin: unpin,
};
}]);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Host.js b/web/gui/src/main/webapp/app/view/topo2/topo2Host.js
index ed3a981..a1eff3d 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Host.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Host.js
@@ -32,7 +32,7 @@
function createHostCollection(data, region) {
var HostCollection = Collection.extend({
- model: Model
+ model: Model,
});
var hosts = [];
@@ -57,7 +57,7 @@
nodeType: 'host',
events: {
- 'click': 'onClick'
+ 'click': 'onClick',
},
initialize: function () {
this.super = this.constructor.__super__;
@@ -69,7 +69,7 @@
this.el.attr('class', this.svgClassName());
}
},
- showDetails: function() {
+ showDetails: function () {
t2hds.displayPanel(this);
},
icon: function () {
@@ -118,7 +118,7 @@
width: glyphSize,
height: glyphSize,
x: -glyphSize / 2,
- y: -glyphSize / 2
+ y: -glyphSize / 2,
});
var labelText = this.label();
@@ -132,13 +132,13 @@
this.setScale();
this.setUpEvents();
this.setVisibility();
- }
+ },
});
return {
- createHostCollection: createHostCollection
+ createHostCollection: createHostCollection,
};
- }
+ },
]);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2HostsPanel.js b/web/gui/src/main/webapp/app/view/topo2/topo2HostsPanel.js
index fcc3f31..410c9ee 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2HostsPanel.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2HostsPanel.js
@@ -40,8 +40,8 @@
'-': '',
'MAC': data.get('id'),
'IP': data.get('ips')[0],
- 'VLAN': 'None' // TODO: VLAN is not currently in the data received from backend
- }
+ 'VLAN': 'None', // TODO: VLAN is not currently in the data received from backend
+ },
};
if (data.get('location')) {
@@ -111,9 +111,9 @@
hide: hide,
toggle: toggle,
destroy: destroy,
- isVisible: function () { return hostPanel.isVisible(); }
+ isVisible: function () { return hostPanel.isVisible(); },
};
- }
+ },
]);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Instance.js b/web/gui/src/main/webapp/app/view/topo2/topo2Instance.js
index 044e3d6..de7c09e 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Instance.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Instance.js
@@ -4,15 +4,12 @@
// injected refs
var $log, ps, sus, gs, flash, ts, t2mss;
- // api from topo
- var api;
-
// configuration
var showLogicErrors = true,
idIns = 'topo2-p-instance',
instOpts = {
edge: 'left',
- width: 20
+ width: 20,
};
// internal state
@@ -97,24 +94,24 @@
instSvg = {
width: 170,
height: 85,
- viewBox: '0 0 170 85'
+ viewBox: '0 0 170 85',
},
headRect = {
x: rox,
y: roy,
width: rw,
- height: rhh
+ height: rhh,
},
bodyRect = {
x: rox,
y: roy + rhh,
width: rw,
- height: rbh
+ height: rbh,
},
titleAttr = {
class: 'instTitle',
x: tx,
- y: 27
+ y: 27,
};
var onoses = oiBox.el().selectAll('.onosInst')
@@ -180,7 +177,7 @@
svg.append('text').attr({
class: 'instLabel ' + id,
x: tx,
- y: ty
+ y: ty,
}).text(label);
ty += 18;
}
@@ -215,8 +212,7 @@
}
}
- function initInst(_api_) {
- api = _api_;
+ function initInst() {
oiBox = ps.createPanel(idIns, instOpts);
oiBox.show();
@@ -286,9 +282,9 @@
allInstances: allInstances,
destroy: destroy,
toggle: toggle,
- isVisible: function () { return oiBox.isVisible(); }
+ isVisible: function () { return oiBox.isVisible(); },
};
- }
+ },
]);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2KeyCommands.js b/web/gui/src/main/webapp/app/view/topo2/topo2KeyCommands.js
index 939b9d2..554ee06 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2KeyCommands.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2KeyCommands.js
@@ -18,7 +18,7 @@
// Injected Services
var $log, fs, ks, flash, wss, t2ps, t2bgs, ps, t2is, t2sp, t2vs, t2rs,
- t2fs, t2sls, t2tbs;
+ t2fs, t2tbs;
// Commmands
function actionMap() {
@@ -38,8 +38,8 @@
esc: handleEscape,
- _keyListener: t2tbs.keyListener.bind(t2tbs)
- }
+ _keyListener: t2tbs.keyListener.bind(t2tbs),
+ };
}
function init(_t2fs_, _t2tbs_) {
@@ -74,7 +74,7 @@
['shift-click', 'Toggle selection state'],
['drag', 'Reposition (and pin) device / host'],
['cmd-scroll', 'Zoom in / out'],
- ['cmd-drag', 'Pan']
+ ['cmd-drag', 'Pan'],
]);
}
@@ -170,12 +170,12 @@
function toggleHosts() {
var on = t2rs.toggleHosts();
- actionedFlashed(on ? 'Show': 'Hide', 'Hosts')
+ actionedFlashed(on ? 'Show': 'Hide', 'Hosts');
}
function toggleOfflineDevices() {
var on = t2rs.toggleOfflineDevices();
- actionedFlashed(on ? 'Show': 'Hide', 'offline devices')
+ actionedFlashed(on ? 'Show': 'Hide', 'offline devices');
}
function notValid(what) {
@@ -204,10 +204,10 @@
'$log', 'FnService', 'KeyService', 'FlashService', 'WebSocketService',
'Topo2PrefsService', 'Topo2BackgroundService', 'PrefsService',
'Topo2InstanceService', 'Topo2SummaryPanelService', 'Topo2ViewService',
- 'Topo2RegionService', 'Topo2SpriteLayerService',
+ 'Topo2RegionService',
function (_$log_, _fs_, _ks_, _flash_, _wss_, _t2ps_, _t2bgs_, _ps_,
- _t2is_, _t2sp_, _t2vs_, _t2rs_, _t2sls_) {
+ _t2is_, _t2sp_, _t2vs_, _t2rs_) {
$log = _$log_;
fs = _fs_;
@@ -221,13 +221,12 @@
t2sp = _t2sp_;
t2vs = _t2vs_;
t2rs = _t2rs_;
- t2sls = _t2sls_;
return {
init: init,
bindCommands: bindCommands,
- getActionEntry: getActionEntry
+ getActionEntry: getActionEntry,
};
- }
+ },
]);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Label.js b/web/gui/src/main/webapp/app/view/topo2/topo2Label.js
index 28f134c..e00febd 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Label.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Label.js
@@ -25,20 +25,20 @@
var defaultStyles = {
label: {
text: {
- fill: '#000000'
+ fill: '#000000',
},
rect: {
- fill: '#ffffff'
- }
+ fill: '#ffffff',
+ },
},
icon: {
glyph: {
- fill: '#000000'
+ fill: '#000000',
},
rect: {
- fill: '#ffffff'
- }
- }
+ fill: '#ffffff',
+ },
+ },
};
angular.module('ovTopo2')
@@ -69,9 +69,9 @@
this._labelG.text.text(this.get('label'));
this._labelG.rect.attr({
width: width,
- height: height
+ height: height,
}).style({
- transform: sus.translate(-(width/2) + 'px', -(height/2) + 'px')
+ transform: sus.translate(-(width/2) + 'px', -(height/2) + 'px'),
});
}
},
@@ -108,9 +108,9 @@
this._labelG.rect.attr({
width: this._labelG.text.node().getBBox().width + 20,
- height: this._labelG.text.node().getBBox().height + 10
+ height: this._labelG.text.node().getBBox().height + 10,
}).style({
- transform: sus.translate('-50%', '-50%')
+ transform: sus.translate('-50%', '-50%'),
});
},
renderIcon: function () {
@@ -123,7 +123,7 @@
this._iconG.rect = this._iconG.el.append('rect')
.attr({
width: this.iconSize,
- height: this.iconSize
+ height: this.iconSize,
});
this._iconG.glyph = is.addDeviceIcon(this._iconG.el,
@@ -131,9 +131,9 @@
var iconX = (-bbox.width / 2) - this.iconSize + 'px',
- iconY = -this.iconSize /2 + 'px';
+ iconY = -this.iconSize /2 + 'px';
this._iconG.el.style({
- transform: sus.translate(iconX, iconY)
+ transform: sus.translate(iconX, iconY),
});
},
beforeRender: function () {},
@@ -141,7 +141,7 @@
this.el = this.parent.append('g')
.attr('class', 'topo2-label')
.style({
- transform: 'translate(300px, 300px)'
+ transform: 'translate(300px, 300px)',
});
this.content = this.el.append('g')
@@ -160,8 +160,8 @@
afterRender: function () {},
remove: function () {
this.el.remove();
- }
+ },
});
- }
+ },
]);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2LabelCollection.js b/web/gui/src/main/webapp/app/view/topo2/topo2LabelCollection.js
index ba05bb5..64c5a55 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2LabelCollection.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2LabelCollection.js
@@ -36,13 +36,13 @@
if (this._byId[label.id]) {
this.get(label.id).set(label);
} else {
- var lab = new Model(label, targetNode, options)
+ var lab = new Model(label, targetNode, options);
this.add(lab);
}
- }
+ },
});
return instance || new LabelCollection();
- }
+ },
]);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Layout.js b/web/gui/src/main/webapp/app/view/topo2/topo2Layout.js
index a64a75b..7be4c6a 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Layout.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Layout.js
@@ -34,20 +34,20 @@
device: -8000,
host: -20000,
region: -8000,
- _def_: -12000
+ _def_: -12000,
},
linkDistance: {
// note: key is link.type
direct: 100,
optical: 120,
UiEdgeLink: 100,
- _def_: 50
+ _def_: 50,
},
linkStrength: {
// note: key is link.type
// range: {0.0 ... 1.0}
- _def_: 1.0
- }
+ _def_: 1.0,
+ },
};
// configuration
@@ -55,20 +55,20 @@
light: {
baseColor: '#939598',
inColor: '#66f',
- outColor: '#f00'
+ outColor: '#f00',
},
dark: {
// TODO : theme
baseColor: '#939598',
inColor: '#66f',
- outColor: '#f00'
+ outColor: '#f00',
},
inWidth: 12,
- outWidth: 10
+ outWidth: 10,
};
// internal state
- var nodeLock = false; // whether nodes can be dragged or not (locked)
+ var nodeLock = false; // whether nodes can be dragged or not (locked)
// predicate that indicates when clicking is active
function clickEnabled() {
@@ -117,7 +117,7 @@
linkLabelG: this.addElement(this.forceG, 'topo2-linkLabels'),
numLinksLabels: this.addElement(this.forceG, 'topo2-numLinkLabels'),
nodeG: this.addElement(this.forceG, 'topo2-nodes'),
- portLabels: this.addElement(this.forceG, 'topo2-portLabels')
+ portLabels: this.addElement(this.forceG, 'topo2-portLabels'),
};
},
addElement: function (parent, className) {
@@ -138,7 +138,7 @@
.linkStrength(this.settingOrDefault.bind(this, 'linkStrength'))
.nodes([])
.links([])
- .on("tick", this.tick.bind(this))
+ .on('tick', this.tick.bind(this))
.start();
this.drag = sus.createDragBehavior(this.force,
@@ -173,15 +173,15 @@
var dx = isNaN(d.x) ? 0 : d.x,
dy = isNaN(d.y) ? 0 : d.y;
return sus.translate(dx, dy);
- }
+ },
});
this.link
.each(this.setLinkPosition)
- .attr("x1", function (d) { return d.get('position').x1; })
- .attr("y1", function (d) { return d.get('position').y1; })
- .attr("x2", function (d) { return d.get('position').x2; })
- .attr("y2", function (d) { return d.get('position').y2; });
+ .attr('x1', function (d) { return d.get('position').x1; })
+ .attr('y1', function (d) { return d.get('position').y1; })
+ .attr('x2', function (d) { return d.get('position').x2; })
+ .attr('y2', function (d) { return d.get('position').y2; });
},
start: function () {
@@ -215,13 +215,13 @@
// Need to guard against NaN here ??
return sus.translate(d.node.x, d.node.y);
},
- opacity: 0
+ opacity: 0,
})
.call(this.drag)
.transition()
.attr('opacity', 1);
- entering.each(function (d) { d.onEnter(this, d) });
+ entering.each(function (d) { d.onEnter(this, d); });
this.force.nodes(regionNodes);
},
@@ -242,10 +242,10 @@
x2: function (d) { return d.get('position').x2; },
y2: function (d) { return d.get('position').y2; },
stroke: linkConfig.light.inColor,
- 'stroke-width': linkConfig.inWidth
+ 'stroke-width': linkConfig.inWidth,
});
- entering.each(function (d) { d.onEnter(this, d) });
+ entering.each(function (d) { d.onEnter(this, d); });
// operate on exiting links:
this.link.exit()
@@ -280,15 +280,15 @@
y: d.y,
equivLoc: {
lng: ll[0],
- lat: ll[1]
- }
+ lat: ll[1],
+ },
};
}
d.metaUi = metaUi;
wss.sendEvent('updateMeta2', {
id: d.get('id'),
class: d.get('class'),
- memento: metaUi
+ memento: metaUi,
});
},
setDimensions: function () {
@@ -341,12 +341,12 @@
.style('opacity', 1)
.each('end', function () {
t2rns.navigateToRegionComplete();
- });;
+ }); ;
},
navigateToRegionHandler: function () {
this.createForceElements();
this.transitionDownRegion();
- }
+ },
});
function getInstance(svg, forceG, uplink, dim, zoomer, opts) {
@@ -354,7 +354,7 @@
}
return getInstance();
- }
+ },
]
);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Link.js b/web/gui/src/main/webapp/app/view/topo2/topo2Link.js
index 6954920..9a25894 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Link.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Link.js
@@ -39,16 +39,16 @@
light: {
baseColor: '#939598',
inColor: '#66f',
- outColor: '#f00'
+ outColor: '#f00',
},
dark: {
// TODO : theme
baseColor: '#939598',
inColor: '#66f',
- outColor: '#f00'
+ outColor: '#f00',
},
inWidth: 12,
- outWidth: 10
+ outWidth: 10,
};
function createLink() {
@@ -62,8 +62,8 @@
x1: 0,
y1: 0,
x2: 0,
- y2: 0
- }
+ y2: 0,
+ },
// functions to aggregate dual link state
// extra: link.extra
});
@@ -109,7 +109,7 @@
return {
source: sourceNode,
- target: targetNode
+ target: targetNode,
};
}
@@ -134,7 +134,7 @@
{
enhanced: this.get('enhanced'),
selected: this.get('selected'),
- suppressedmax: this.get('mastership')
+ suppressedmax: this.get('mastership'),
},
(this.linkLabel) ? this.linkLabel.linkLabelCSSClass() : null
);
@@ -168,7 +168,7 @@
point = this.locatePortLabel();
angular.extend(point, {
id: 'topo2-port-tgt',
- num: this.get('portB')
+ num: this.get('portB'),
});
data.push(point);
@@ -176,7 +176,7 @@
point = this.locatePortLabel(1);
angular.extend(point, {
id: 'topo2-port-src',
- num: this.get('portA')
+ num: this.get('portA'),
});
data.push(point);
}
@@ -224,8 +224,8 @@
x1: this.get('source').x,
y1: this.get('source').y,
x2: this.get('target').x,
- y2: this.get('target').y
- }
+ y2: this.get('target').y,
+ };
},
calcMovement: function (amt, flipped) {
var pos = this.defaultPosition(),
@@ -238,7 +238,7 @@
x1: pos.x1 + (mult * dy / length),
y1: pos.y1 + (mult * -dx / length),
x2: pos.x2 + (mult * dy / length),
- y2: pos.y2 + (mult * -dx / length)
+ y2: pos.y2 + (mult * -dx / length),
};
},
setPosition: function () {
@@ -282,7 +282,7 @@
deselect: function () {
this.set({
'selected': false,
- 'enhanced': false
+ 'enhanced': false,
});
},
showDetails: function () {
@@ -394,7 +394,7 @@
this.el.style('visibility', visible ? 'visible' : 'hidden');
},
displayMastership: function () {
- this.set({ mastership: t2mss.mastership() !== null});
+ this.set({ mastership: t2mss.mastership() !== null });
},
remove: function () {
@@ -407,11 +407,11 @@
.transition()
.delay(1000)
.style('opacity', 0);
- }
+ },
});
var LinkCollection = Collection.extend({
- model: LinkModel
+ model: LinkModel,
});
return new LinkCollection(data);
@@ -444,8 +444,8 @@
t2ts = _t2ts_;
return {
- createLinkCollection: createLinkCollection
+ createLinkCollection: createLinkCollection,
};
- }
+ },
]);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2LinkLabel.js b/web/gui/src/main/webapp/app/view/topo2/topo2LinkLabel.js
index 66b06e5..162eb2c 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2LinkLabel.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2LinkLabel.js
@@ -47,7 +47,7 @@
var link = this.link;
this.set({
x: (link.source.x + link.target.x) / 2,
- y: (link.source.y + link.target.y) / 2
+ y: (link.source.y + link.target.y) / 2,
});
},
setScale: function () {
@@ -61,8 +61,8 @@
this.link.linkLabel = null;
this.link.onChange();
this.constructor.__super__.remove.apply(this, arguments);
- }
+ },
});
- }
+ },
]);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2LinkPanel.js b/web/gui/src/main/webapp/app/view/topo2/topo2LinkPanel.js
index b3a7a5b..a5b570d 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2LinkPanel.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2LinkPanel.js
@@ -42,7 +42,7 @@
propOrder: [
'Type', '-',
'A Type', 'A Id', 'A Label', 'A Port', '-',
- 'B Type', 'B Id', 'B Label', 'B Port'
+ 'B Type', 'B Id', 'B Label', 'B Port',
],
props: {
'-': '',
@@ -54,8 +54,8 @@
'B Type': target.get('nodeType'),
'B Id': target.get('id'),
'B Label': target.get('props').name,
- 'B Port': data.get('portB') || 'N/A'
- }
+ 'B Port': data.get('portB') || 'N/A',
+ },
};
}
@@ -117,9 +117,9 @@
hide: hide,
toggle: toggle,
destroy: destroy,
- isVisible: function () { return linkPanel.isVisible(); }
+ isVisible: function () { return linkPanel.isVisible(); },
};
- }
+ },
]);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Map.js b/web/gui/src/main/webapp/app/view/topo2/topo2Map.js
index 002ca69..202a1cf 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Map.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Map.js
@@ -23,14 +23,13 @@
'use strict';
// Injected Services
- var $log, $loc, ps, ms, flash, sus, t2zs, countryFilters;
+ var t2zs, countryFilters, ms;
// internal state
- var instance, mapG, zoomLayer, zoomer, currentMap;
+ var instance, zoomer, currentMap;
function init() {
this.appendElement('#topo2-background', 'g');
- zoomLayer = d3.select('#topo2-zoomlayer');
zoomer = t2zs.getZoomer();
currentMap = null;
}
@@ -38,7 +37,7 @@
function setUpMap(mapId, mapFilePath, mapScale) {
if (currentMap === mapId) {
- return new Promise(function(resolve) {
+ return new Promise(function (resolve) {
resolve();
});
}
@@ -48,7 +47,7 @@
var loadMap = ms.loadMapInto,
promise, cfilter;
- this.node().selectAll("*").remove();
+ this.node().selectAll('*').remove();
if (mapFilePath === '*countries') {
cfilter = countryFilters[mapId] || countryFilters.uk;
@@ -58,7 +57,7 @@
promise = loadMap(this.node(), mapFilePath, mapId, {
countryFilters: cfilter,
adjustScale: mapScale || 1,
- shading: ''
+ shading: '',
});
return promise;
@@ -80,19 +79,11 @@
angular.module('ovTopo2')
.factory('Topo2MapService', [
- '$log', '$location', 'Topo2ViewController', 'PrefsService',
- 'MapService', 'FlashService', 'SvgUtilService', 'Topo2ZoomService',
+ 'Topo2ZoomService', 'MapService', 'Topo2ViewController',
- function (_$log_, _$loc_, ViewController, _ps_,
- _ms_, _flash_, _sus_, _t2zs_) {
-
- $log = _$log_;
- $loc = _$loc_;
- ps = _ps_;
- ms = _ms_;
- flash = _flash_;
- sus = _sus_;
+ function (_t2zs_, _ms_, ViewController) {
t2zs = _t2zs_;
+ ms = _ms_;
var MapLayer = ViewController.extend({
@@ -103,10 +94,10 @@
setUpMap: setUpMap,
resetZoom: resetZoom,
zoomCallback: zoomCallback,
- getCurrentMap: getCurrentMap
+ getCurrentMap: getCurrentMap,
});
return instance || new MapLayer();
- }
+ },
]);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2MapConfig.js b/web/gui/src/main/webapp/app/view/topo2/topo2MapConfig.js
index ffb7f86..9ffa8f7 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2MapConfig.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2MapConfig.js
@@ -31,7 +31,7 @@
function projection(x) {
if (x) {
proj = x;
- $log.debug("Set the projection");
+ $log.debug('Set the projection');
}
return proj;
}
@@ -44,9 +44,9 @@
$log = _$log_;
return {
- projection: projection
+ projection: projection,
};
- }
+ },
]
);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Mastership.js b/web/gui/src/main/webapp/app/view/topo2/topo2Mastership.js
index 7b1735f..1fef792 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Mastership.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Mastership.js
@@ -49,10 +49,10 @@
setMastership: function (id) {
this.currentMastership = id;
this.displayMastership();
- }
- }
+ },
+ };
return instance || new MastershipController();
- }
+ },
]);
-})();
\ No newline at end of file
+})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Model.js b/web/gui/src/main/webapp/app/view/topo2/topo2Model.js
index 6da29c4..56941f4 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Model.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Model.js
@@ -117,7 +117,7 @@
if (this.collection) {
this.collection.remove(this);
}
- }
+ },
};
angular.module('ovTopo2')
@@ -127,6 +127,6 @@
Model.extend = fn.extend;
return Model;
- }
+ },
]);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2NoDevicesConnected.js b/web/gui/src/main/webapp/app/view/topo2/topo2NoDevicesConnected.js
index d0c08d3..0d9e670 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2NoDevicesConnected.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2NoDevicesConnected.js
@@ -36,7 +36,7 @@
instance = this;
this.appendElement('#topo2', 'g')
.attr({
- transform: sus.translate(500, 500)
+ transform: sus.translate(500, 500),
});
this.render();
@@ -49,16 +49,16 @@
g = this.node().append('g');
gs.addGlyph(g, 'bird', 100).attr('class', 'noDevsBird');
g.append('text').text('No devices are connected')
- .attr({ x: 120, y: 80});
+ .attr({ x: 120, y: 80 });
box = g.node().getBBox();
box.x -= box.width/2;
box.y -= box.height/2;
g.attr('transform', sus.translate(box.x, box.y));
- }
+ },
});
return instance || new NoDevicesConnected();
- }
+ },
]);
-})();
\ No newline at end of file
+})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2NodeModel.js b/web/gui/src/main/webapp/app/view/topo2/topo2NodeModel.js
index 7498696..9b275c9 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2NodeModel.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2NodeModel.js
@@ -35,18 +35,18 @@
var dColTheme = {
light: {
online: '#444444',
- offline: '#cccccc'
+ offline: '#cccccc',
},
dark: {
// TODO: theme
online: '#444444',
- offline: '#cccccc'
- }
+ offline: '#cccccc',
+ },
},
// and here are the stroke colors of the glyph, per theme
dUseTheme = {
light: 'white',
- dark: 'black'
+ dark: 'black',
};
angular.module('ovTopo2')
@@ -72,7 +72,7 @@
this.mastershipService = t2mss;
this._events = {
'mouseover': 'mouseoverHandler',
- 'mouseout': 'mouseoutHandler'
+ 'mouseout': 'mouseoutHandler',
};
},
select: function () {
@@ -162,7 +162,7 @@
x: -dim / 2 - labelPad,
y: -dim / 2 - labelPad,
width: dim + labelWidth + (labelPad * 2) + _textPad,
- height: dim + (labelPad * 2)
+ height: dim + (labelPad * 2),
};
},
iconBox: function (dim, labelWidth) {
@@ -170,7 +170,7 @@
x: -dim / 2,
y: -dim / 2,
width: dim + labelWidth,
- height: dim
+ height: dim,
};
},
svgClassName: function () {
@@ -182,7 +182,7 @@
selected: this.get('selected'),
hovered: this.get('hovered'),
fixed: this.get('fixed'),
- suppressedmax: this.get('mastership')
+ suppressedmax: this.get('mastership'),
}
);
},
@@ -194,7 +194,7 @@
t2nps.setLongLat(this);
},
displayMastership: function () {
- this.set({ mastership: t2mss.mastership() !== null});
+ this.set({ mastership: t2mss.mastership() !== null });
},
update: function () {
this.updateLabel();
@@ -247,7 +247,7 @@
return {
rect: rect,
- text: text
+ text: text,
};
},
addIconElements: function (el) {
@@ -256,7 +256,7 @@
glyph;
var iconG = el.append('g')
- .attr('class', 'icon')
+ .attr('class', 'icon');
iconG.append('rect')
.attr('class', 'icon-rect')
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2NodePosition.js b/web/gui/src/main/webapp/app/view/topo2/topo2NodePosition.js
index 8889168..1b7a88c 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2NodePosition.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2NodePosition.js
@@ -72,7 +72,7 @@
if (!loc.latOrY && !loc.longOrX) {
loc = {
longOrX: -20,
- latOrY: 10 * node.index()
+ latOrY: 10 * node.index(),
};
}
@@ -101,14 +101,14 @@
function rand() {
return {
x: rs.randDim(dim[0]),
- y: rs.randDim(dim[1])
+ y: rs.randDim(dim[1]),
};
}
function near(node) {
return {
x: node.x + nearDist + rs.spread(nearDist),
- y: node.y + nearDist + rs.spread(nearDist)
+ y: node.y + nearDist + rs.spread(nearDist),
};
}
@@ -176,8 +176,8 @@
return {
positionNode: positionNode,
- setLongLat: setLongLat
+ setLongLat: setLongLat,
};
- }
+ },
]);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Overlay.js b/web/gui/src/main/webapp/app/view/topo2/topo2Overlay.js
index de85acf..d16417e 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Overlay.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Overlay.js
@@ -22,12 +22,11 @@
var t2os = 'Topo2OverlayService: ';
// injected refs
- var $log, $timeout, fs, gs, wss, t2kcs, t2rs, t2lc, api, LinkLabel;
+ var $log, fs, t2kcs, t2rs, t2lc, LinkLabel;
// internal state
var overlays = {},
- current = null,
- reset = true;
+ current = null;
function error(fn, msg) {
$log.error(t2os + fn + '(): ' + msg);
@@ -119,10 +118,6 @@
// === -----------------------------------------------------
// Event Handlers (events from server)
- function setApi(_api_) {
- api = _api_;
- }
-
function setOverlay(ovid) {
var ov = overlays[ovid];
if (!ov) {
@@ -143,7 +138,7 @@
nodeLink = t2rs.getLink(id);
if (nodeLink) {
t2lc.addLabel(LinkLabel, link, linkLabelsDOM, {
- link: nodeLink
+ link: nodeLink,
});
}
});
@@ -153,17 +148,13 @@
angular.module('ovTopo2')
.factory('Topo2OverlayService', [
- '$log', '$timeout', 'FnService', 'GlyphService', 'WebSocketService',
- 'Topo2KeyCommandService', 'Topo2RegionService', 'Topo2LabelCollection',
- 'Topo2LinkLabel',
+ '$log', 'FnService', 'Topo2KeyCommandService',
+ 'Topo2RegionService', 'Topo2LabelCollection', 'Topo2LinkLabel',
- function (_$log_, _$timeout_, _fs_, _gs_, _wss_, _t2kcs_, _t2rs_,
+ function (_$log_, _fs_, _t2kcs_, _t2rs_,
_t2lc_, _t2ll_) {
$log = _$log_;
- $timeout = _$timeout_;
fs = _fs_;
- gs = _gs_;
- wss = _wss_;
t2kcs = _t2kcs_;
t2rs = _t2rs_;
t2lc = _t2lc_;
@@ -171,7 +162,6 @@
return {
register: register,
- setApi: setApi,
setOverlay: setOverlay,
hooks: {
@@ -180,11 +170,10 @@
singleSelect: singleSelectHook,
multiSelect: multiSelectHook,
mouseOver: mouseOverHook,
- mouseOut: mouseOutHook
+ mouseOut: mouseOutHook,
},
- showHighlights: showHighlights
- }
- }
+ showHighlights: showHighlights,
+ };
+ },
]);
-
-}());
\ No newline at end of file
+}());
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Panel.js b/web/gui/src/main/webapp/app/view/topo2/topo2Panel.js
index 88ba678..dd7722b 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Panel.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Panel.js
@@ -51,16 +51,16 @@
return this.footer.append(x);
},
emptyRegions: function () {
- this.header.selectAll("*").remove();
- this.body.selectAll("*").remove();
- this.footer.selectAll("*").remove();
+ this.header.selectAll('*').remove();
+ this.body.selectAll('*').remove();
+ this.footer.selectAll('*').remove();
},
destroy: function () {
ps.destroyPanel(this.id);
},
isVisible: function () {
return this.el.isVisible();
- }
+ },
};
angular.module('ovTopo2')
@@ -71,7 +71,7 @@
ps = _ps_;
return View.extend(panel);
- }
+ },
]);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2PeerRegion.js b/web/gui/src/main/webapp/app/view/topo2/topo2PeerRegion.js
index 9e8ad31..738ce08 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2PeerRegion.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2PeerRegion.js
@@ -25,14 +25,14 @@
var Collection, Model;
var remappedDeviceTypes = {
- virtual: 'cord'
+ virtual: 'cord',
};
function createCollection(data, region) {
var PeerRegionCollection = Collection.extend({
model: Model,
- region: region
+ region: region,
});
return new PeerRegionCollection(data);
@@ -52,7 +52,7 @@
nodeType: 'peer-region',
events: {
'dblclick': 'navigateToRegion',
- 'click': 'onClick'
+ 'click': 'onClick',
},
initialize: function () {
@@ -76,13 +76,13 @@
if (d3.event.defaultPrevented) return;
t2rns.navigateToRegion(this.get('id'));
t2srp.hide();
- }
+ },
});
return {
- createCollection: createCollection
+ createCollection: createCollection,
};
- }
+ },
]);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Prefs.js b/web/gui/src/main/webapp/app/view/topo2/topo2Prefs.js
index 9d822c8..2f69f7b 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Prefs.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Prefs.js
@@ -30,8 +30,8 @@
porthl: 1,
bg: 0,
spr: 0,
- ovid: 'traffic', // default to traffic overlay
- toolbar: 0
+ ovid: 'traffic', // default to traffic overlay
+ toolbar: 0,
};
function topo2Prefs() {
@@ -59,8 +59,8 @@
return {
get: get,
- set: set
+ set: set,
};
- }
+ },
]);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Region.js b/web/gui/src/main/webapp/app/view/topo2/topo2Region.js
index cd4a75b..bba3f39 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Region.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Region.js
@@ -53,7 +53,7 @@
var RegionModel = Model.extend({
findNodeById: this.findNodeById,
- nodes: this.regionNodes.bind(this)
+ nodes: this.regionNodes.bind(this),
});
this.model = new RegionModel();
@@ -67,7 +67,7 @@
this.model.set({ peerRegions: t2pr.createCollection([], this) });
this.model.set({ links: t2ls.createLinkCollection([], this) });
},
- isLoadComplete: function() {
+ isLoadComplete: function () {
return this.bgRendered && this.regionData && this.peers;
},
loaded: function (key, value) {
@@ -80,7 +80,7 @@
this.model.set({
id: this.regionData.id,
- layerOrder: this.regionData.layerOrder
+ layerOrder: this.regionData.layerOrder,
});
this.sortMultiLinks();
@@ -117,7 +117,7 @@
if (peer.id === id) {
peer.location = location;
}
- })
+ });
});
},
sortMultiLinks: function () {
@@ -147,12 +147,11 @@
_.each(collection, function (link, index) {
link.multiline = {
deviceLinks: collection.length,
- index: index
- }
+ index: index,
+ };
});
}
- })
-
+ });
},
isRootRegion: function () {
return this.model.get('id') === ROOT;
@@ -248,17 +247,17 @@
},
update: function (event) {
- if (!this.isLoadComplete()){
+ if (!this.isLoadComplete()) {
this.layout.createForceLayout();
}
if (this[event.type]) {
this[event.type](event);
} else {
- $log.error("Unhanded topology update", event);
+ $log.error('Unhanded topology update', event);
}
- this.layout.update()
+ this.layout.update();
this.displayNoDevs();
},
displayNoDevs: function () {
@@ -272,11 +271,10 @@
// Topology update event handlers
LINK_ADDED_OR_UPDATED: function (event) {
- var regionLinks = this.model.get('links'),
- device;
+ var regionLinks = this.model.get('links');
if (!regionLinks) {
- this.model.set({ links: t2ls.createLinkCollection([], this) })
+ this.model.set({ links: t2ls.createLinkCollection([], this) });
}
if (event.memo === 'added') {
@@ -296,7 +294,7 @@
device;
if (!regionDevices) {
- this.model.set({ devices: t2ds.createDeviceCollection([], this) })
+ this.model.set({ devices: t2ds.createDeviceCollection([], this) });
}
if (event.memo === 'added') {
@@ -315,7 +313,7 @@
host;
if (!regionHosts) {
- this.model.set({ hosts: t2hs.createHostCollection([], this) })
+ this.model.set({ hosts: t2hs.createHostCollection([], this) });
}
if (event.memo === 'added') {
@@ -328,14 +326,14 @@
region;
if (!regionSubRegions) {
- this.model.set({ subregions: t2sr.createSubRegionCollection([], this) })
+ this.model.set({ subregions: t2sr.createSubRegionCollection([], this) });
}
if (event.memo === 'added') {
region = this.model.get('subregions').add(event.data);
$log.debug('Added region', region);
}
- }
+ },
});
function getInstance() {
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2RegionNavigation.js b/web/gui/src/main/webapp/app/view/topo2/topo2RegionNavigation.js
index 092ec2c..9cf78e3 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2RegionNavigation.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2RegionNavigation.js
@@ -50,7 +50,7 @@
navigateToRegion: function (id) {
$loc.search('regionId', id);
wss.sendEvent('topo2navRegion', {
- rid: id
+ rid: id,
});
this.notifyListeners('region:navigation-start', id);
},
@@ -60,7 +60,7 @@
destory: function () {
this.listeners = {};
- }
+ },
};
angular.module('ovTopo2')
@@ -72,6 +72,6 @@
wss = _wss_;
return instance || new RegionNavigationService();
- }
+ },
]);
-})();
\ No newline at end of file
+})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Select.js b/web/gui/src/main/webapp/app/view/topo2/topo2Select.js
index 49fbfe7..d7fe6a5 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Select.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Select.js
@@ -27,7 +27,7 @@
var instance,
consumeClick,
zoomer,
- previousNearestLink; // previous link to mouse position
+ previousNearestLink; // previous link to mouse position
function mouseClickHandler() {
if (d3.event.defaultPrevented) return;
@@ -162,11 +162,11 @@
},
updateDetails: function () {
- var nodeCount = this.selectedNodes.length;
+ var nodeCount = this.selectedNodes.length;
if (nodeCount === 1) {
this.selectedNodes[0].showDetails();
- } else if (nodeCount > 1) {
+ } else if (nodeCount > 1) {
t2ddp.showMulti(this.selectedNodes);
} else {
t2ddp.hide();
@@ -211,7 +211,7 @@
var cc = consumeClick;
consumeClick = Boolean(x);
return cc;
- }
+ },
};
angular.module('ovTopo2')
@@ -221,7 +221,7 @@
t2zs = _t2zs_;
t2ddp = _t2ddp_;
return instance || new SelectionService();
- }
+ },
]);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2SpriteLayer.js b/web/gui/src/main/webapp/app/view/topo2/topo2SpriteLayer.js
index f53ccc6..6d1b8c6 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2SpriteLayer.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2SpriteLayer.js
@@ -19,11 +19,10 @@
Defines behavior for loading sprites into the sprite layer.
*/
- (function() {
+ (function () {
'use strict';
- var instance,
- renderer;
+ var instance;
function vbox(w, h) {
return '0 0 ' + w + ' ' + h;
@@ -41,14 +40,14 @@
id: 'topo2-sprites',
displayName: 'Sprite Layer',
- init: function() {
+ init: function () {
this.svg = d3.select('#topo2');
this.createSpriteDefs();
this.container = this.appendElement('#topo2-background', 'g');
},
loadLayout: function (id) {
var _this = this;
- this.container.selectAll("*").remove();
+ this.container.selectAll('*').remove();
this.layout = ss.layout(id);
if (this.layout) {
@@ -65,7 +64,7 @@
}
// Returns a promise for consistency with Topo2MapService
- return new Promise(function(resolve) {
+ return new Promise(function (resolve) {
resolve(_this);
});
},
@@ -132,7 +131,7 @@
layout
.append('g')
- .append("use")
+ .append('use')
.attr('xlink:href', '#rack')
.attr('width', 20)
.attr('height', 25)
@@ -164,7 +163,7 @@
.attr('y', i * gridSpacing)
.attr('x', 0);
}
- }
+ },
});
function getInstance() {
@@ -172,6 +171,6 @@
}
return getInstance();
- }
- ])
- })();
\ No newline at end of file
+ },
+ ]);
+ })();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2SubRegion.js b/web/gui/src/main/webapp/app/view/topo2/topo2SubRegion.js
index c426d64..a34e075 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2SubRegion.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2SubRegion.js
@@ -25,14 +25,14 @@
var Collection, Model;
var remappedDeviceTypes = {
- virtual: 'cord'
+ virtual: 'cord',
};
function createSubRegionCollection(data, region) {
var SubRegionCollection = Collection.extend({
model: Model,
- region: region
+ region: region,
});
return new SubRegionCollection(data);
@@ -52,7 +52,7 @@
nodeType: 'sub-region',
events: {
'dblclick': 'navigateToRegion',
- 'click': 'onClick'
+ 'click': 'onClick',
},
initialize: function () {
@@ -76,13 +76,13 @@
if (d3.event.defaultPrevented) return;
t2rns.navigateToRegion(this.get('id'));
t2srp.hide();
- }
+ },
});
return {
- createSubRegionCollection: createSubRegionCollection
+ createSubRegionCollection: createSubRegionCollection,
};
- }
+ },
]);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2SubRegionPanel.js b/web/gui/src/main/webapp/app/view/topo2/topo2SubRegionPanel.js
index e084980..68e091a 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2SubRegionPanel.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2SubRegionPanel.js
@@ -41,8 +41,8 @@
'Id': data.get('id'),
'Type': data.get('nodeType'),
'Number of Devices': data.get('nDevs'),
- 'Number of Hosts': data.get('nHosts')
- }
+ 'Number of Hosts': data.get('nHosts'),
+ },
};
}
@@ -103,9 +103,9 @@
hide: hide,
toggle: toggle,
destroy: destroy,
- isVisible: function () { return subRegionPanel.isVisible(); }
+ isVisible: function () { return subRegionPanel.isVisible(); },
};
- }
+ },
]);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2SummaryPanel.js b/web/gui/src/main/webapp/app/view/topo2/topo2SummaryPanel.js
index 982cd5d4..6b651f7 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2SummaryPanel.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2SummaryPanel.js
@@ -33,10 +33,10 @@
className = 'topo2-p',
panelOpts = {
show: true,
- width: 260 // summary and detail panel width
+ width: 260, // summary and detail panel width
},
handlerMap = {
- showSummary: handleSummaryData
+ showSummary: handleSummaryData,
};
function init(_detailsPanel_) {
@@ -47,7 +47,7 @@
wss.sendEvent('requestSummary');
var options = angular.extend({}, panelOpts, {
- class: className
+ class: className,
});
summaryPanel = new Panel(id, options);
@@ -128,9 +128,9 @@
toggle: toggle,
destroy: destroy,
isVisible: function () { return summaryPanel.isVisible(); },
- getInstance: function () { return summaryPanel; }
+ getInstance: function () { return summaryPanel; },
};
- }
+ },
]);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Toolbar.js b/web/gui/src/main/webapp/app/view/topo2/topo2Toolbar.js
index 1edcdff..ec45bd8 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Toolbar.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Toolbar.js
@@ -24,7 +24,7 @@
// key to button mapping data
var k2b = {
- O: { id: 'topo2-summary-tog', gid: 'm_summary', isel: true},
+ O: { id: 'topo2-summary-tog', gid: 'm_summary', isel: true },
I: { id: 'topo2-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 },
@@ -37,7 +37,7 @@
L: { id: 'topo2-cycleLabels-btn', gid: 'm_cycleLabels' },
R: { id: 'topo2-resetZoom-btn', gid: 'm_resetZoom' },
- E: { id: 'topo2-eqMaster-btn', gid: 'm_eqMaster' }
+ E: { id: 'topo2-eqMaster-btn', gid: 'm_eqMaster' },
};
angular.module('ovTopo2')
@@ -63,11 +63,13 @@
this.el.hide();
},
initKeyData: function () {
- _.each(k2b, function(value, key) {
+ _.each(k2b, function (value, key) {
var data = t2kcs.getActionEntry(key);
if (data) {
- value.cb = data[0]; // on-click callback
- value.tt = data[1] + ' (' + key + ')'; // tooltip
+ // on-click callback
+ value.cb = data[0];
+ // tooltip
+ value.tt = data[1] + ' (' + key + ')';
}
});
},
@@ -82,11 +84,11 @@
}
},
addButton: function (key) {
- var v = this.getKey(key);
+ var v = this.getKey(key);
v.btn = this.el.addButton(v.id, v.gid, v.cb, v.tt);
},
addToggle: function (key, suppressIfMobile) {
- var v = this.getKey(key);
+ var v = this.getKey(key);
if (suppressIfMobile && fs.isMobile()) { return; }
v.tog = this.el.addToggle(v.id, v.gid, v.isel, v.cb, v.tt);
},
@@ -107,7 +109,7 @@
this.addToggle('B');
},
addSecondRow: function () {
- //addToggle('X');
+ // addToggle('X');
// this.addToggle('Z');
// this.addButton('N');
this.addButton('L');
@@ -120,10 +122,10 @@
// TODO: Should the tbs remove button id's in the destroyToolbar method?
// If you go topo2 -> topo -> topo2 there's a button id conflict
tbs.destroyToolbar(this.className);
- }
+ },
};
return instance || new Toolbar();
- }
+ },
]);
-}());
\ No newline at end of file
+}());
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Traffic.js b/web/gui/src/main/webapp/app/view/topo2/topo2Traffic.js
index 1cb703f..994e32c 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Traffic.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Traffic.js
@@ -19,18 +19,18 @@
'use strict';
// injected refs
- var $log, fs, flash, wss, api;
+ var $log, flash, wss;
// configuration
var allTrafficTypes = [
'flowStatsBytes',
'portStatsBitSec',
- 'portStatsPktSec'
+ 'portStatsPktSec',
],
allTrafficMsgs = [
'Flow Stats (bytes)',
'Port Stats (bits / second)',
- 'Port Stats (packets / second)'
+ 'Port Stats (packets / second)',
];
// internal state
@@ -57,7 +57,7 @@
mode = 'allFlowPort';
wss.sendEvent('topo2RequestAllTraffic', {
- trafficType: allTrafficTypes[allIndex]
+ trafficType: allTrafficTypes[allIndex],
});
flash.flash(allTrafficMsgs[allIndex]);
currentIndex = allIndex;
@@ -72,23 +72,23 @@
angular.module('ovTopo2')
.factory('Topo2TrafficService', [
- '$log', 'FnService', 'FlashService', 'WebSocketService',
+ '$log', 'FlashService', 'WebSocketService',
- function (_$log_, _fs_, _flash_, _wss_) {
+ function (_$log_, _flash_, _wss_) {
$log = _$log_;
- fs = _fs_;
flash = _flash_;
wss = _wss_;
return {
- initTraffic: function (_api_) { api = _api_; },
+ // TODO: Remove References
+ initTraffic: function (_api_) {},
destroyTraffic: function () {},
// invoked from toolbar overlay buttons or keystrokes
cancelTraffic: cancelTraffic,
showAllTraffic: showAllTraffic,
- selectedTrafficOverlay: selectedTrafficOverlay
- }
- }
+ selectedTrafficOverlay: selectedTrafficOverlay,
+ };
+ },
]);
-}());
\ No newline at end of file
+}());
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2TrafficOverlay.js b/web/gui/src/main/webapp/app/view/topo2/topo2TrafficOverlay.js
index 19d0844..a606078 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2TrafficOverlay.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2TrafficOverlay.js
@@ -30,12 +30,12 @@
tooltip: 'Traffic Overlay',
activate: function () {
- $log.debug("Traffic-2 overlay ACTIVATED");
+ $log.debug('Traffic-2 overlay ACTIVATED');
},
deactivate: function () {
t2ts.cancelTraffic(true);
- $log.debug("Traffic-2 overlay DEACTIVATED");
+ $log.debug('Traffic-2 overlay DEACTIVATED');
},
// key bindings for toolbar buttons
@@ -44,18 +44,18 @@
0: {
cb: function () { t2ts.cancelTraffic(true); },
tt: 'Cancel traffic monitoring',
- gid: 'm_xMark'
+ gid: 'm_xMark',
},
A: {
cb: function () { t2ts.showAllTraffic(); },
tt: 'Monitor all traffic',
- gid: 'm_allTraffic'
+ gid: 'm_allTraffic',
},
_keyOrder: [
- '0', 'A'
- ]
+ '0', 'A',
+ ],
},
hooks: {
@@ -63,10 +63,10 @@
escape: function () {
// Must return true to consume ESC, false otherwise.
return t2ts.cancelTraffic(true);
- }
+ },
// TODO : add node selection events etc.
// NOTE : see topoTrafficNew.js
- }
+ },
};
// invoke code to register with the overlay service
@@ -80,4 +80,4 @@
t2ov.register(overlay);
}]);
-}());
\ No newline at end of file
+}());
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2View.js b/web/gui/src/main/webapp/app/view/topo2/topo2View.js
index ae29894..9e6d6b1 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2View.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2View.js
@@ -28,7 +28,7 @@
// Internal State
var dimensions,
viewOptions = {
- linkPortHighlighting: true
+ linkPortHighlighting: true,
};
function newDim(_dimensions) {
@@ -65,9 +65,9 @@
getDimensions: getDimensions,
togglePortHighlights: togglePortHighlights,
- getPortHighlighting: getPortHighlighting
+ getPortHighlighting: getPortHighlighting,
};
- }
+ },
]
);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2ViewController.js b/web/gui/src/main/webapp/app/view/topo2/topo2ViewController.js
index 190f751..7387c94 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2ViewController.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2ViewController.js
@@ -34,10 +34,10 @@
displayName: 'View',
initialize: function () {
- this.name = this.displayName.toLowerCase().replace(/ /g,"_");
+ this.name = this.displayName.toLowerCase().replace(/ /g, '_');
this.prefs = {
- visible: this.name + '_visible'
- }
+ visible: this.name + '_visible',
+ };
},
appendElement: function (parent, node) {
var el = d3.select('#' + this.id);
@@ -46,7 +46,7 @@
}
return el;
},
- node: function() {
+ node: function () {
return d3.select('#' + this.id);
},
enabled: function () {
@@ -64,7 +64,7 @@
.duration(400)
.style('opacity', 0)
.each('end', function () {
- node.style('visibility', 'hidden')
+ node.style('visibility', 'hidden');
});
}
},
@@ -76,7 +76,7 @@
.style('visibility', 'visible')
.transition()
.duration(400)
- .style('opacity', 1)
+ .style('opacity', 1);
}
},
toggle: function () {
@@ -95,7 +95,7 @@
var state = ps.getPrefs('topo2_prefs');
state[key] = value ? 1 : 0;
ps.setPrefs('topo2_prefs', state);
- }
+ },
};
angular.module('ovTopo2')
@@ -108,6 +108,6 @@
ViewController.extend = fn.extend;
return ViewController;
- }
+ },
]);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2Zoom.js b/web/gui/src/main/webapp/app/view/topo2/topo2Zoom.js
index 3e6f12a..f70496b 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Zoom.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Zoom.js
@@ -23,7 +23,7 @@
'use strict';
// injected references
- var fs, zs, ps;
+ var fs, zs;
// internal state
var zoomer,
@@ -91,12 +91,11 @@
angular.module('ovTopo2')
.factory('Topo2ZoomService', [
- 'FnService', 'ZoomService', 'PrefsService',
- function (_fs_, _zs_, _ps_) {
+ 'FnService', 'ZoomService',
+ function (_fs_, _zs_) {
fs = _fs_;
zs = _zs_;
- ps = _ps_;
return {
getZoomer: getZoomer,
@@ -106,7 +105,7 @@
scale: scale,
adjustmentScale: adjustmentScale,
- panAndZoom: panAndZoom
+ panAndZoom: panAndZoom,
};
}]);
})();
diff --git a/web/gui/src/main/webapp/app/view/topo2/uiView.js b/web/gui/src/main/webapp/app/view/topo2/uiView.js
index 77419a5..ba1219e 100644
--- a/web/gui/src/main/webapp/app/view/topo2/uiView.js
+++ b/web/gui/src/main/webapp/app/view/topo2/uiView.js
@@ -47,12 +47,12 @@
// TODO: Unbind Events
this.empty();
return this;
- }
+ },
});
View.extend = fn.extend;
return View;
- }
+ },
]);
})();