commit 583f4be429c15f9229604b7a587790f219a300b4
author Steven Burrows <sburrows@villa-technologies.com> Fri Nov 04 14:06:50 2016 +0100
committer Gerrit Code Review <gerrit@onlab.us> Sat Nov 12 18:49:46 2016 +0000
tree d35a75bca0804ed6fc1335867872724406318136
parent a6f858966e36be5665f9273a90a15c4682413ad0

Topo2: ONOS Build Paris Demo tweaks

Change-Id: I93a01b077bdff4152f1ab3e7ebe8391232b846dc

web/gui/src/main/webapp/app/view/topo2/topo2NodeModel.js

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 42275bf..048e2f9 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2NodeModel.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2NodeModel.js
@@ -97,12 +97,15 @@
                 icon: function () {
                     return 'unknown';
                 },
+                labelIndex: function () {
+                    return ps.get('dlbls');
+                },
                 label: function () {
                     var props = this.get('props'),
                         id = this.get('id'),
                         friendlyName = props && props.name ? props.name : id,
                         labels = ['', friendlyName || id, id],
-                        nli = ps.get('dlbls'),
+                        nli = this.labelIndex(),
                         idx = (nli < labels.length) ? nli : 0;
 
                     return labels[idx];
@@ -225,7 +228,8 @@
                     glyph.attr(this.iconBox(devIconDim, 0));
                     glyph.style('fill', 'white');
 
-                    node.attr('transform', sus.translate(-halfDevIcon, -halfDevIcon));
+                    node.attr('transform',
+                        sus.translate(-halfDevIcon, -halfDevIcon));
 
                     if (this.events) {
                         this.setUpEvents();