diff options
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/consts.js | 3 | ||||
| -rw-r--r-- | src/client/model/diff.js | 7 | ||||
| -rw-r--r-- | src/client/model/graph.js | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/src/client/consts.js b/src/client/consts.js index b20ce9ce..83bf5728 100644 --- a/src/client/consts.js +++ b/src/client/consts.js @@ -19,6 +19,9 @@ define(function() { description: description, NEW_NODE_NAME: 'new node', + // Our database cannot encode zero length names, so we never (unless, bug) send those + EMPTY_LINK_NAME: 'untitled', + // Virtual Keycodes i.e. event.keyCode / event.key // https://dvcs.w3.org/hg/dom3events/raw-file/tip/html/DOM3-Events.html#keys-keyvalues VK_UP: 38, diff --git a/src/client/model/diff.js b/src/client/model/diff.js index fa5fe9e1..36f62ddb 100644 --- a/src/client/model/diff.js +++ b/src/client/model/diff.js @@ -3,8 +3,8 @@ /** * Diff module */ -define([], - function() { +define(['consts'], + function(consts) { /** * A set of diff objects @@ -114,6 +114,9 @@ define([], Attr_Diff.prototype.add_link_attr_write = function(l_id, attr_name, attr_val) { + if ('name' === attr_name && String(attr_val).length === 0) { + attr_val = consts.EMPTY_LINK_NAME; + } if (undefined == this.__type_link[l_id]) { this.init_attr_diff_link(l_id); } diff --git a/src/client/model/graph.js b/src/client/model/graph.js index f8783127..7056cac6 100644 --- a/src/client/model/graph.js +++ b/src/client/model/graph.js @@ -380,7 +380,7 @@ function Graph(spec) { if (!rz_config.backend_enabled) return; var attr_diff = model_diff.new_attr_diff(); - for (var key in new_link_spec){ + for (var key in new_link_spec) { attr_diff.add_link_attr_write(link.id, key, new_link_spec[key]); } @@ -554,7 +554,7 @@ function Graph(spec) { src_node = find_node__by_id(src_id), added_links = node_ids.slice(1).map(function (tgt_id) { return model_core.create_link__set_random_id(src_node, find_node__by_id(tgt_id), - {name: 'link'}); + {name: consts.EMPTY_LINK_NAME}); }); commit_and_tx_diff__topo(model_diff.new_topo_diff({link_set_add: added_links})); }; |