summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Levy <alon@pobox.com>2015-04-05 18:14:57 +0300
committerAlon Levy <alon@pobox.com>2015-04-05 21:27:16 +0300
commit0408b28c2712157a6d4853042883be9f9e3e299f (patch)
treef04e4c4dfcb18aef95f91a1c3dbaea339c30eee3
parent8c9b90edd74ba7f6c506865695f6aef369481d2b (diff)
client: rename edge_info to link_info
for f in `git grep -l edge_info`; do sed -ie 's/edge_info/link_info/g' $f; done for f in `git grep -l EDGE_INFO`; do sed -ie 's/EDGE_INFO/LINK_INFO/g' $f; done git mv src/client/view/edge_info.js src/client/view/link_info.js
-rw-r--r--res/client/css/partials/info-card.scss2
-rw-r--r--res/client/css/style.css2
-rw-r--r--res/templates/index.html2
-rw-r--r--src/client/view/graph_view.js6
-rw-r--r--src/client/view/internal.js6
-rw-r--r--src/client/view/link_info.js (renamed from src/client/view/edge_info.js)0
-rw-r--r--src/client/view/view.js6
7 files changed, 12 insertions, 12 deletions
diff --git a/res/client/css/partials/info-card.scss b/res/client/css/partials/info-card.scss
index eeafb46c..29a481b7 100644
--- a/res/client/css/partials/info-card.scss
+++ b/res/client/css/partials/info-card.scss
@@ -15,7 +15,7 @@
float:right;
}
-.edge_info, .info {
+.link_info, .info {
color: $dark-grey;
background-color: white;
@include rz-box-shadow(0px, 1px, 6px, 0px, rgba(0,0,0,0.3) );
diff --git a/res/client/css/style.css b/res/client/css/style.css
index 2edf88b1..78bcb5bc 100644
--- a/res/client/css/style.css
+++ b/res/client/css/style.css
@@ -484,7 +484,7 @@ body.debug .debug-ui-right {
font-size: 12px;
float: right; }
-.edge_info, .info {
+.link_info, .info {
color: #363636;
background-color: white;
-webkit-box-shadow: 0px 1px 6px 0px rgba(0, 0, 0, 0.3);
diff --git a/res/templates/index.html b/res/templates/index.html
index 089b4dcd..e667b2f9 100644
--- a/res/templates/index.html
+++ b/res/templates/index.html
@@ -96,7 +96,7 @@ var rz_config = { // set as a global variable
</div>
</div>
<div class="info-container">
- <div class="edge_info" style="display:none">Title: <span id="edgetitle"></span><br/>
+ <div class="link_info" style="display:none">Title: <span id="edgetitle"></span><br/>
<button id="deleteedge">Delete</button>
</div>
<div class="info" style="display:none">
diff --git a/src/client/view/graph_view.js b/src/client/view/graph_view.js
index f8f1c4ad..234ed976 100644
--- a/src/client/view/graph_view.js
+++ b/src/client/view/graph_view.js
@@ -512,11 +512,11 @@ function GraphView(spec) {
}
var that = this;
- view.edge_info.on_delete(function () {
- view.edge_info.hide();
+ view.link_info.on_delete(function () {
+ view.link_info.hide();
graph.links__delete([that.link.id]);
});
- view.edge_info.show(d);
+ view.link_info.show(d);
(d3.event.shiftKey? selection.invert_link : selection.select_link)(this.link);
});
diff --git a/src/client/view/internal.js b/src/client/view/internal.js
index bc18bd75..8bb2ca64 100644
--- a/src/client/view/internal.js
+++ b/src/client/view/internal.js
@@ -1,12 +1,12 @@
define(['view/tab'],
function(tab) {
-var EDGE_INFO_SELECTOR = '.edge_info',
+var LINK_INFO_SELECTOR = '.link_info',
NODE_INFO_SELECTOR = '.info',
- edit_tab = new tab.Tab({edge: EDGE_INFO_SELECTOR, node: NODE_INFO_SELECTOR});
+ edit_tab = new tab.Tab({edge: LINK_INFO_SELECTOR, node: NODE_INFO_SELECTOR});
return {
- EDGE_INFO_SELECTOR: EDGE_INFO_SELECTOR,
+ LINK_INFO_SELECTOR: LINK_INFO_SELECTOR,
NODE_INFO_SELECTOR: NODE_INFO_SELECTOR,
edit_tab: edit_tab,
};
diff --git a/src/client/view/edge_info.js b/src/client/view/link_info.js
index d711e200..d711e200 100644
--- a/src/client/view/edge_info.js
+++ b/src/client/view/link_info.js
diff --git a/src/client/view/view.js b/src/client/view/view.js
index 95bfc09b..575dc0a5 100644
--- a/src/client/view/view.js
+++ b/src/client/view/view.js
@@ -1,10 +1,10 @@
"use strict"
-define(['view/node_info', 'view/edge_info', 'view/internal'],
-function(view_node_info, view_edge_info, view_internal) {
+define(['view/node_info', 'view/link_info', 'view/internal'],
+function(view_node_info, view_link_info, view_internal) {
return {
'node_info': view_node_info,
- 'edge_info': view_edge_info,
+ 'link_info': view_link_info,
'hide': function() {
view_internal.edit_tab.hide();
},