commit 1aa4f58a94f15888a69727ca433407b2d50618b9
author Steven Burrows <sburrows@villa-technologies.com> Tue Dec 13 15:05:41 2016 -0500
committer Steven Burrows <sburrows@villa-technologies.com> Wed Dec 14 16:47:46 2016 -0500
tree 90cb14d761a9df8bccd54d704c763f11d5fbebc7
parent 7656b196af3cd731b4a38efd4b8f9e69b81296ec

Topo2: Compute nearest link by mouse position
Topo2: Deselect Nodes and Links on ESC command
Topo2: Added deselect methods to nodes
Topo2: Updated to new icon

Change-Id: Ia0aaa24e887d645123787f42bb1f847ef1de11b0

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

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 b552a9e..d769631 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2Link.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2Link.js
@@ -157,9 +157,9 @@
                 var data = [],
                     point;
 
-                angular.forEach(this.collection.models, function (link) {
-                    link.unenhance();
-                });
+                // angular.forEach(this.collection.models, function (link) {
+                //     link.unenhance();
+                // });
 
                 this.set('enhanced', true);
 
@@ -212,7 +212,13 @@
                 this.set('enhanced', false);
                 d3.select('#topo-portLabels').selectAll('.portLabel').remove();
             },
+            getSelected: function () {
+                return this.collection.filter(function (m) {
+                    return m.get('selected');
+                });
+            },
             select: function () {
+
                 var ev = d3.event;
 
                 // TODO: if single selection clear selected devices, hosts, sub-regions
@@ -223,15 +229,16 @@
                 });
 
                 this.set('selected', !s);
+                this.showDetails();
 
-                var selected = this.collection.filter(function (m) {
-                    return m.get('selected');
-                });
-
-                return selected;
+                return this.getSelected();
+            },
+            deselect: function () {
+                this.set('selected', false);
+                this.set('enhanced', false);
             },
             showDetails: function () {
-                var selected = this.select(d3.event);
+                var selected = this.getSelected();
 
                 if (selected) {
                     t2lps.displayLink(this);
@@ -298,12 +305,6 @@
                 this.el = link;
                 this.restyleLinkElement();
 
-                // TODO: Needs improving - originally this was calculated
-                // from mouse position.
-                this.el.on('mouseover', this.enhance.bind(this));
-                this.el.on('mouseout', this.unenhance.bind(this));
-                this.el.on('click', this.showDetails.bind(this));
-
                 if (this.get('type') === 'hostLink') {
                     // sus.visible(link, api.showHosts());
                 }