From 05677dbc35f5b14665b55c49fa910699ae6a8887 Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Mon, 16 Feb 2015 19:59:28 +0200 Subject: client/graph/merge: re-instate confirm dialog for rename-to-merge --- src/client/model/graph.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/client/model/graph.js') diff --git a/src/client/model/graph.js b/src/client/model/graph.js index 954e7583..c7e255ec 100644 --- a/src/client/model/graph.js +++ b/src/client/model/graph.js @@ -422,7 +422,11 @@ function Graph(spec) { */ var n_eq_name = find_node__by_name(new_node_spec.name); if (null !== n_eq_name && n_eq_name !== node) { - return nodes__merge([n_eq_name.id, node.id]); + if (window.confirm('really merge ' + node.name + ' into ' + n_eq_name.name + '?')) { + return nodes__merge([n_eq_name.id, node.id]); + } else { + return; // do nothing + } } node['name'] = new_node_spec['name']; // [!] may still fail due to server NAK -- cgit v1.3.1