commit 6ac93f39731a69135afddf1419d99bef87fd7c87
author Simon Hunt <simon@onlab.us> Thu Nov 13 12:17:27 2014 -0800
committer Gerrit Code Review <gerrit@onlab.us> Thu Nov 13 13:34:38 2014 -0800
tree 6ed6a95e36b88b183e9363bbe264acf54f061e1e
parent f5d263b41f32d1cef9d6fe7f6d52708e9a9b2f71

GUI --Cleaned up mouse-over/out in preparation for 'show-traffic' behavior.
 - re-instated the unpin function.

Change-Id: I310804084b93e1cd16f3da31b49ea646db36c6d7

web/gui/src/main/webapp/json/ev/intentSketch/ev_4_onos.json

diff --git a/web/gui/src/main/webapp/json/ev/intentSketch/ev_4_onos.json b/web/gui/src/main/webapp/json/ev/intentSketch/ev_4_onos.json
index bbb2001..f78616a 100644
--- a/web/gui/src/main/webapp/json/ev/intentSketch/ev_4_onos.json
+++ b/web/gui/src/main/webapp/json/ev/intentSketch/ev_4_onos.json
@@ -13,7 +13,7 @@
         "intentId": "0x4321",
         "links": [ "5-6", "6-7" ],
         "class": "animated",
-        "traffic": [ "4GB", "4GB" ]
+        "labels": [ "4GB", "4GB" ]
       }
     ]
   }

web/gui/src/main/webapp/topo2.js

diff --git a/web/gui/src/main/webapp/topo2.js b/web/gui/src/main/webapp/topo2.js
index f660f20..d87cd27 100644
--- a/web/gui/src/main/webapp/topo2.js
+++ b/web/gui/src/main/webapp/topo2.js
@@ -160,9 +160,9 @@
         detailPane,
         selectOrder = [],
         selections = {},
+        hovered = null,
 
         highlighted = null,
-        hovered = null,
         viewMode = 'showAll',
         portLabelsOn = false;
 
@@ -290,8 +290,12 @@
         view.alert('togglePorts() callback')
     }
 
-    function unpin(view) {
-        view.alert('unpin() callback')
+    function unpin() {
+        if (hovered) {
+            hovered.fixed = false;
+            hovered.el.classed('fixed', false);
+            network.force.resume();
+        }
     }
 
     // ==============================
@@ -931,6 +935,21 @@
         // TODO: review what else might need to be updated
     }
 
+    function nodeMouseOver(d) {
+        console.log("Hover:", d);
+        hovered = d;
+        if (d.class === 'host') {
+            //requestTraffic(d);
+        }
+    }
+
+    function nodeMouseOut(d) {
+        console.log("Unhover:", d);
+        hovered = null;
+        if (d.class === 'host') {
+            //cancelTraffic(d);
+        }
+    }
 
     function updateNodes() {
         node = nodeG.selectAll('.node')
@@ -950,19 +969,8 @@
                 opacity: 0
             })
             .call(network.drag)
-            .on('mouseover', function (d) {
-                console.log(d);
-                if (d.class === 'host') {
-                    requestTraffic(d);
-                }
-            })
-            .on('mouseout', function (d) {
-                console.log(d);
-                if (d.class === 'host') {
-                    cancelTraffic(d);
-                }
-            })
-            //.on('mouseover', function (d) {})
+            .on('mouseover', nodeMouseOver)
+            .on('mouseout', nodeMouseOut)
             .transition()
             .attr('opacity', 1);