From 22d8f75dab43ec3f291bf53eb400b9306f0314cb Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Sun, 11 Jan 2015 19:11:22 +0200 Subject: client: allow rename case of node (no merge et); Fixes #254 --- src/client/model/graph.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/client/model/graph.js') diff --git a/src/client/model/graph.js b/src/client/model/graph.js index 73617734..7141c61c 100644 --- a/src/client/model/graph.js +++ b/src/client/model/graph.js @@ -408,7 +408,9 @@ function Graph(spec) { } // TODO: handle NAK: add problem emblem to link - on_success(); + if (on_success !== undefined) { + on_success(); + } }; var on_ajax_error = function(){ @@ -429,7 +431,7 @@ function Graph(spec) { * handle name update collision: suggest removal first */ var n_eq_name = find_node__by_name(new_node_spec.name); - if (undefined != n_eq_name) { + if (undefined !== n_eq_name && n_eq_name !== node) { // delete colliding node on rename console.warn('update_node: name collision blocked due to node rename'); undefined != on_error && on_error(); -- cgit v1.3.1