summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLV-426 <lv-426@taproot.org.il>2015-01-02 17:19:28 +0200
committerLV-426 <lv-426@taproot.org.il>2015-01-02 17:56:27 +0200
commit321137b26f4f68bb0407977912e9a8d4fa9995d8 (patch)
tree72e6759a22d381df0883d76071fb26b0455b4803
parentac5cf0eed52025334b81b1f5e3c17f60b6ce883f (diff)
use commit_diff__attr() on 'diff_merge__attr' ws msg
-rw-r--r--src/client/rz_mesh.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/client/rz_mesh.js b/src/client/rz_mesh.js
index 969c2b68..0d8f0478 100644
--- a/src/client/rz_mesh.js
+++ b/src/client/rz_mesh.js
@@ -28,6 +28,7 @@ define([ 'rz_config', 'util', 'model/diff', 'socketio'], function(rz_config, uti
socket.on('disconnect', on_disconnect);
socket.on('error', on_error);
socket.on('diff_commit__topo', diff_merge__topo);
+ socket.on('diff_commit__attr', diff_merge__attr);
}
function on_connect() {
@@ -49,6 +50,11 @@ define([ 'rz_config', 'util', 'model/diff', 'socketio'], function(rz_config, uti
rz_mesh_graph_ref.commit_diff__topo(topo_diff);
}
+ function diff_merge__attr(attr_diff_raw) {
+ console.log('ws: rx: diff_merge__attr');
+ var attr_diff_json = JSON.parse(attr_diff_raw);
+ var attr_diff = model_diff.new_attr_diff(attr_diff_json);
+ rz_mesh_graph_ref.commit_diff__attr(attr_diff);
}
return {