summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/client/main.js2
-rw-r--r--src/client/view/selection.js4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/client/main.js b/src/client/main.js
index 640651dc..e615ce9a 100644
--- a/src/client/main.js
+++ b/src/client/main.js
@@ -47,7 +47,7 @@ function(textanalysis_ui, textanalysis, buttons, history, drag_n_drop,
model_core.init(rz_config);
textanalysis.init(rz_core.main_graph);
search.init();
- selection.setup_merge_button(rz_core.main_graph);
+ selection.setup_toolbar(rz_core.main_graph);
$.feedback({ajaxURL: rz_config.feedback_url});
}
diff --git a/src/client/view/selection.js b/src/client/view/selection.js
index cd16ef51..5e24e801 100644
--- a/src/client/view/selection.js
+++ b/src/client/view/selection.js
@@ -223,7 +223,7 @@ var update = function(nodes, append)
}
}
-var setup_merge_button = function(main_graph)
+var setup_toolbar = function(main_graph)
{
var merge_root_selection = function() {
main_graph.nodes__merge(root_nodes_ids());
@@ -269,7 +269,7 @@ return {
node_selected: node_selected,
link_selected: link_selected,
selectionChangedBus: selectionChangedBus,
- setup_merge_button: setup_merge_button,
+ setup_toolbar: setup_toolbar,
__get_root_nodes: function() { return root_nodes; },
__get_selected_nodes: function() { return selected_nodes; },