From 64e93c8326b67fc18da7902300299040aca50fcf Mon Sep 17 00:00:00 2001
From: Devin Howard <devin@callysto.com>
Date: Sat, 5 Jan 2013 23:12:32 -0500
Subject: [PATCH] don't highlight synapses when mouse is over a node

---
 app/assets/javascripts/Jit/graphsettings.js | 26 ++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/Jit/graphsettings.js b/app/assets/javascripts/Jit/graphsettings.js
index e0e1be5d..0d15006a 100644
--- a/app/assets/javascripts/Jit/graphsettings.js
+++ b/app/assets/javascripts/Jit/graphsettings.js
@@ -50,12 +50,6 @@ function graphSettings(type) {
             type: 'HTML',
             onMouseMove: function(node, eventInfo, e) {
               onMouseMoveHandler(node, eventInfo, e);
-            },
-            onMouseEnter: function () {
-               
-            },
-            onMouseLeave: function () {
-               
             },
             //Update node positions when dragged
             onDragMove: function (node, eventInfo, e) {
@@ -191,12 +185,6 @@ function graphSettings(type) {
             type: 'HTML',
             onMouseMove: function(node, eventInfo, e) {
               onMouseMoveHandler(node, eventInfo, e);
-            },
-            onMouseEnter: function () {
-               
-            },
-            onMouseLeave: function () {
-               
             },
             //Update node positions when dragged
             onDragMove: function (node, eventInfo, e) {
@@ -235,7 +223,9 @@ function graphSettings(type) {
             onClick: function (node, eventInfo, e) {
 			   if (e.target.id != "infovis-canvas") return false;
                //clicking on an edge, a node, or clicking on blank part of canvas?
-               if (eventInfo.getEdge() != false || node.nodeFrom) {
+               console.log(eventInfo);
+               console.log(eventInfo.getNode());
+               if (eventInfo.getNode() == false) {
 					if (eventInfo.getEdge() != false) selectEdgeOnClickHandler(eventInfo.getEdge(), e);
 					else if (node.nodeFrom) selectEdgeOnClickHandler(node, e);  
 			   }
@@ -795,11 +785,21 @@ function onCreateLabelHandler(domElement, node) {
 
 }//onCreateLabelHandler
 
+//edge that the mouse is currently hovering over
 var edgeHover = false;
 
 function onMouseMoveHandler(node, eventInfo, e) {
   var edge = eventInfo.getEdge();
+  var node = eventInfo.getNode();
   
+  //if we're on top of a node object, act like there aren't edges under it
+  if (node != false) {
+    if (edgeHover) {
+      onMouseLeave(edgeHover);
+    }
+    return;
+  }
+
   if (edge == false && edgeHover != false) {
     //mouse not on an edge, but we were on an edge previously
     onMouseLeave(edgeHover);