summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorAlon Levy <alon@pobox.com>2015-01-11 16:04:09 +0200
committerAlon Levy <alon@pobox.com>2015-01-11 16:05:13 +0200
commitb60be8cc54af6d32d87e40a43182d3d01a7fe1b8 (patch)
tree9e817265f6c0f11919d776737c95c86d1160b8e5 /src/client
parentf2c465ec65d3abaa956dba9ee6134ad0070a0d7e (diff)
client/selection: add link_selected, use it for linktext
Diffstat (limited to 'src/client')
-rw-r--r--src/client/view/graph_view.js2
-rw-r--r--src/client/view/selection.js8
2 files changed, 7 insertions, 3 deletions
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; },