CSS Added fill-mode for nodes
Amends based on Simons Comments
ESLinted The whole project
Topo2Link - Added Labels for PortA and PortB on mouseover
Updated breadcrumbs
Topo2.js - commented out a line causing error on panning
Topo2 Navigation between regions
Change-Id: I9cc0f4499ab68a14e246bba192f6528258471b35
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 e0aefb7..36f4264 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Collection.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Collection.js
@@ -26,12 +26,14 @@
function Collection(models, options) {
- options || (options = {});
+ var opts = options || (options = {});
this.models = [];
this._reset();
- if (options.comparator !== void 0) this.comparator = options.comparator;
+ if (opts.comparator) {
+ this.comparator = opts.comparator;
+ }
if (models) {
this.add(models);
@@ -48,7 +50,8 @@
data.forEach(function (d) {
- var model = new _this.model(d);
+ var CollectionModel = _this.model;
+ var model = new CollectionModel(d);
model.collection = _this;
_this.models.push(model);
@@ -57,9 +60,11 @@
}
},
get: function (id) {
+
if (!id) {
- return void 0;
+ return null;
}
+
return this._byId[id] || null;
},
sort: function () {
@@ -76,9 +81,11 @@
this._byId = [];
this.models = [];
},
- toJSON: function(options) {
- return this.models.map(function(model) { return model.toJSON(options); });
- },
+ toJSON: function (options) {
+ return this.models.map(function (model) {
+ return model.toJSON(options);
+ });
+ }
};
Collection.extend = function (protoProps, staticProps) {