summaryrefslogtreecommitdiff
path: root/src/client/model
diff options
context:
space:
mode:
authorAlon Levy <alon@pobox.com>2015-01-06 13:51:51 +0200
committerAlon Levy <alon@pobox.com>2015-01-06 13:51:51 +0200
commit7fd7384da2703a9d48caa6a2c82ceca9aa809262 (patch)
tree765dc42784f3f6134bc888a4f9d00e122710ba29 /src/client/model
parent9a3f5b0a527b0f34cadebd31b4daf0223d0f58b9 (diff)
client/model/graph: fix server pending
Diffstat (limited to 'src/client/model')
-rw-r--r--src/client/model/graph.js15
1 files changed, 7 insertions, 8 deletions
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);
});
}