diff options
| author | Alon Levy <alon@pobox.com> | 2015-02-16 19:59:28 +0200 |
|---|---|---|
| committer | Alon Levy <alon@pobox.com> | 2015-02-16 19:59:28 +0200 |
| commit | 05677dbc35f5b14665b55c49fa910699ae6a8887 (patch) | |
| tree | 1acfdc537562b2cd14ef7209384ef88de052e6d9 /src | |
| parent | d9cd71848230ecb1e70e8e75c6f8f6619473d884 (diff) | |
client/graph/merge: re-instate confirm dialog for rename-to-merge
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/model/graph.js | 6 |
1 files changed, 5 insertions, 1 deletions
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 |