summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlon Levy <alon@pobox.com>2015-01-05 17:07:43 +0200
committerAlon Levy <alon@pobox.com>2015-01-05 17:07:54 +0200
commit6769f3d3ee0358ced4ab1677f36bea6a02268f0a (patch)
tree87649ba4df075b2521c353bb05af1a297b4a6fc9 /src
parent5bae17df31469a0773eb7ce832817390a83cd3e0 (diff)
client/view/graph_view: partial fix for link text not showing
Diffstat (limited to 'src')
-rw-r--r--src/client/view/graph_view.js11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/client/view/graph_view.js b/src/client/view/graph_view.js
index 082338ca..43a7e849 100644
--- a/src/client/view/graph_view.js
+++ b/src/client/view/graph_view.js
@@ -266,13 +266,14 @@ function GraphView(spec) {
linktext
.text(function(d) {
- var name = d.name || "";
- if (!(temporary ||
- d.__src.state === "chosen" || d.__dst.state === "chosen")) {
+ var name = d.name || "",
+ src_selected = selection.node_selected(d.__src),
+ dst_selected = selection.node_selected(d.__dst);
+
+ if (!temporary && !src_selected && !dst_selected) {
return "";
}
- if (name.length < 25 || d.__src.state === "chosen" ||
- d.__dst.state === "chosen" || temporary) {
+ if (temporary || name.length < 25 || src_selected || dst_selected) {
return name;
} else {
return name.substring(0, 14) + "...";