From 7fd7384da2703a9d48caa6a2c82ceca9aa809262 Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Tue, 6 Jan 2015 13:51:51 +0200 Subject: client/model/graph: fix server pending --- src/client/model/graph.js | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/client/model') diff --git a/src/client/model/graph.js b/src/client/model/graph.js index f6866c21..24255070 100644 --- a/src/client/model/graph.js +++ b/src/client/model/graph.js @@ -686,14 +686,6 @@ function Graph(spec) { util.assert(undefined != n_spec.id, 'load_from_backend: n_spec missing id'); - // server returns a bare node, just the id, we fill it in from cached nodes - // we sent the server, and clean our cache. - // FIXME: should track cache - if (undefined !== server_pending_objects[n_spec.id]) { - $.extend(n_spec, server_pending_objects[n_spec.id]); - delete server_pending_objects[n_spec.idd]; - } - return n_spec; } @@ -726,6 +718,13 @@ function Graph(spec) { function _add_node_set(node_specs) { node_specs.map(function (node_spec) { + // server returns a bare node, just the id, we fill it in from cached nodes + // we sent the server, and clean our cache. + // FIXME: should track cache + if (undefined !== server_pending_objects[node_spec.id]) { + $.extend(node_spec, server_pending_objects[node_spec.id]); + delete server_pending_objects[node_spec.idd]; + } __addNode(node_spec); }); } -- cgit v1.3.1