From 9837f0e2e1100874b253142c61ccc7f6e3621d35 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Sat, 9 Jan 2016 13:47:05 +0000 Subject: [PATCH] Highlight node port when dragging wires and undash the wires --- editor/js/ui/view.js | 8 ++++---- editor/sass/flow.scss | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/editor/js/ui/view.js b/editor/js/ui/view.js index af55a4023..92c99f861 100644 --- a/editor/js/ui/view.js +++ b/editor/js/ui/view.js @@ -1234,7 +1234,7 @@ RED.view = (function() { .on("touchstart", function(d,i){portMouseDown(d,1,0);} ) .on("mouseup", function(d,i){portMouseUp(d,1,0);}) .on("touchend",function(d,i){portMouseUp(d,1,0);} ) - .on("mouseover",function(d,i) { var port = d3.select(this); port.classed("port_hovered",(mouse_mode!=RED.state.JOINING || mousedown_port_type !== 0 ));}) + .on("mouseover",function(d,i) { var port = d3.select(this); port.classed("port_hovered",(mouse_mode!=RED.state.JOINING || (drag_lines.length > 0 && drag_lines[0].portType !== 1)));}) .on("mouseout",function(d,i) { var port = d3.select(this); port.classed("port_hovered",false);}); outGroup.append("svg:text").attr('class','port_label').attr('x',20).attr('y',8).style("font-size","10px").text("output"); @@ -1277,7 +1277,7 @@ RED.view = (function() { .on("touchstart", function(d,i){portMouseDown(d,0,i);} ) .on("mouseup", function(d,i){portMouseUp(d,0,i);}) .on("touchend",function(d,i){portMouseUp(d,0,i);} ) - .on("mouseover",function(d,i) { var port = d3.select(this); port.classed("port_hovered",(mouse_mode!=RED.state.JOINING || mousedown_port_type !== 0 ));}) + .on("mouseover",function(d,i) { var port = d3.select(this); port.classed("port_hovered",(mouse_mode!=RED.state.JOINING || (drag_lines.length > 0 && drag_lines[0].portType !== 0) ));}) .on("mouseout",function(d,i) { var port = d3.select(this); port.classed("port_hovered",false);}); inGroup.append("svg:text").attr('class','port_label').attr('x',18).attr('y',20).style("font-size","10px").text("input"); @@ -1536,7 +1536,7 @@ RED.view = (function() { .on("touchstart",function(d){portMouseDown(d,1,0);}) .on("mouseup",function(d){portMouseUp(d,1,0);} ) .on("touchend",function(d){portMouseUp(d,1,0);} ) - .on("mouseover",function(d) { var port = d3.select(this); port.classed("port_hovered",(mouse_mode!=RED.state.JOINING || mousedown_port_type != 1 ));}) + .on("mouseover",function(d) { var port = d3.select(this); port.classed("port_hovered",(mouse_mode!=RED.state.JOINING || (drag_lines.length > 0 && drag_lines[0].portType !== 1) ));}) .on("mouseout",function(d) { var port = d3.select(this); port.classed("port_hovered",false);}) } @@ -1551,7 +1551,7 @@ RED.view = (function() { .on("touchstart",(function(){var node = d; return function(d,i){portMouseDown(node,0,i);}})() ) .on("mouseup",(function(){var node = d; return function(d,i){portMouseUp(node,0,i);}})() ) .on("touchend",(function(){var node = d; return function(d,i){portMouseUp(node,0,i);}})() ) - .on("mouseover",function(d,i) { var port = d3.select(this); port.classed("port_hovered",(mouse_mode!=RED.state.JOINING || mousedown_port_type !== 0 ));}) + .on("mouseover",function(d,i) { var port = d3.select(this); port.classed("port_hovered",(mouse_mode!=RED.state.JOINING || (drag_lines.length > 0 && drag_lines[0].portType !== 0) ));}) .on("mouseout",function(d,i) { var port = d3.select(this); port.classed("port_hovered",false);}); d._ports.exit().remove(); diff --git a/editor/sass/flow.scss b/editor/sass/flow.scss index 395760201..d4bf110fe 100644 --- a/editor/sass/flow.scss +++ b/editor/sass/flow.scss @@ -186,8 +186,7 @@ .drag_line { stroke: $node-selected-color; - stroke-width: 2; - stroke-dasharray: 15,8; + stroke-width: 3; fill: none; pointer-events: none; }