From b60be8cc54af6d32d87e40a43182d3d01a7fe1b8 Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Sun, 11 Jan 2015 16:04:09 +0200 Subject: client/selection: add link_selected, use it for linktext --- src/client/view/graph_view.js | 2 +- src/client/view/selection.js | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/client') diff --git a/src/client/view/graph_view.js b/src/client/view/graph_view.js index 13387c72..6927c525 100644 --- a/src/client/view/graph_view.js +++ b/src/client/view/graph_view.js @@ -335,7 +335,7 @@ function GraphView(spec) { } }); linktext.each(function (d) { - if (selection.node_selected(d)) { + if (selection.link_selected(d)) { ontop.push(this); } }); diff --git a/src/client/view/selection.js b/src/client/view/selection.js index 44a0d20f..e85a750d 100644 --- a/src/client/view/selection.js +++ b/src/client/view/selection.js @@ -112,13 +112,16 @@ var node_selected = function(node) { return selected_nodes__by_id[node.id] !== undefined; } +var link_selected = function(link) { + return node_selected(link.__src) && node_selected(link.__dst); +} + var selected_class__node = function(node) { return selected_nodes.length > 0 ? (node_selected(node) ? "selected" : "notselected") : ""; } var selected_class__link = function(link) { - return selected_nodes.length > 0 ? (node_selected(link.__src) && node_selected(link.__dst) ? - "selected" : "notselected") : ""; + return selected_nodes.length > 0 ? (link_selected(link) ? "selected" : "notselected") : ""; } var clear = function() { @@ -156,6 +159,7 @@ return { selected_class__node: selected_class__node, selected_class__link: selected_class__link, node_selected: node_selected, + link_selected: link_selected, selectionChangedBus: selectionChangedBus, __get_root_nodes: function() { return root_nodes; }, __get_selected_nodes: function() { return selected_nodes; }, -- cgit v1.3.1