diff options
| author | Alon Levy <alon@pobox.com> | 2015-04-13 10:22:46 +0200 |
|---|---|---|
| committer | Alon Levy <alon@pobox.com> | 2015-04-13 10:22:46 +0200 |
| commit | 0ea1c38d7927c00eae4a162fb0260e6617a84af8 (patch) | |
| tree | 2368783c5364a603dbc63f31c7ab28b991eb1919 /src/client | |
| parent | a4c7c9bff6aacbdb3bdf75e9a7a36a7290fb9ced (diff) | |
client: fix related text not complete
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/view/graph_view.js | 8 | ||||
| -rw-r--r-- | src/client/view/selection.js | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/client/view/graph_view.js b/src/client/view/graph_view.js index 88bf9927..9ab541ac 100644 --- a/src/client/view/graph_view.js +++ b/src/client/view/graph_view.js @@ -466,7 +466,7 @@ function GraphView(spec) { .attr("dy", node_text_dy); node_text.exit().remove(); var nodeText = function(d) { - var selected = selection.node_selected(d); + var selected = selection.node_related(d); if (!d.name) { return "_"; @@ -492,13 +492,13 @@ function GraphView(spec) { $('#' + d.id).hover(function (e) { add_class(this, 'hovering'); // show text if not selected - if (!selection.link_selected(d)) { + if (!selection.link_related(d)) { set_link_label_text(this.id, link_text__short(d)); } }, function (e) { remove_class(this, 'hovering'); // hide text if not selected - if (!selection.link_selected(d)) { + if (!selection.link_related(d)) { set_link_label_text(this.id, ""); } }); @@ -673,7 +673,7 @@ function GraphView(spec) { } }); link_text.each(function (d) { - if (selection.link_selected(d)) { + if (selection.link_related(d)) { ontop.push(this); } }); diff --git a/src/client/view/selection.js b/src/client/view/selection.js index cf42f57b..6c4c3653 100644 --- a/src/client/view/selection.js +++ b/src/client/view/selection.js @@ -176,7 +176,7 @@ var node_first_selected = function(node) { return selected && selected.length > 0 && node.id === selected[0].id; } -var link_selected = function(link) { +var link_related = function(link) { return node_related(link.__src) && node_related(link.__dst); } @@ -188,7 +188,7 @@ var class__node = function(node, temporary) { } var class__link = function(link, temporary) { - return !temporary && related.length > 0 ? (link_selected(link) ? "selected" : "notselected") : ""; + return !temporary && related.length > 0 ? (link_related(link) ? "selected" : "notselected") : ""; } var clear = function() @@ -330,7 +330,8 @@ return { class__node: class__node, class__link: class__link, node_selected: node_selected, - link_selected: link_selected, + node_related: node_related, + link_related: link_related, selectionChangedBus: selectionChangedBus, setup_toolbar: setup_toolbar, |
