summaryrefslogtreecommitdiff
path: root/src/client/rz_mesh.js
diff options
context:
space:
mode:
authorAlon Levy <alon@pobox.com>2015-05-10 12:44:26 +0300
committerAlon Levy <alon@pobox.com>2015-05-12 12:30:04 +0300
commite4652f764bf284d95a5233f5578fc67d2e17eaa0 (patch)
tree7da3bead6c05f21da4d60d43a6fef66d92fa8242 /src/client/rz_mesh.js
parent69412c1e55f13e06cd772c1d98db50548a846d1f (diff)
client: add initial activity stream
activity widget that will show: - history for document loaded, gotten via clone REST api - activity as it happens, identical to diffs received but with the context - which user, when if a topo diff what sentence created it.
Diffstat (limited to 'src/client/rz_mesh.js')
-rw-r--r--src/client/rz_mesh.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/client/rz_mesh.js b/src/client/rz_mesh.js
index 82ddc3b3..6ef41cd1 100644
--- a/src/client/rz_mesh.js
+++ b/src/client/rz_mesh.js
@@ -3,7 +3,8 @@
/**
* Manage backend websocket connection
*/
-define([ 'util', 'model/diff', 'model/util', 'socketio'], function(util, model_diff, model_util, io) {
+define([ 'util', 'model/diff', 'model/util', 'socketio', 'view/activity'],
+function( util, model_diff, model_util, io, activity) {
var ws_server_url = document.location.origin + '/graph'; // socketio namespace
@@ -71,6 +72,7 @@ define([ 'util', 'model/diff', 'model/util', 'socketio'], function(util, model_d
console.log('ws: rx: ws_diff_merge__topo, committing wire-adapted topo_diff:', topo_diff);
+ activity.incomingActivityBus.push(topo_diff_spec);
rz_mesh_graph_ref.commit_diff__topo(model_diff.new_topo_diff(topo_diff_spec));
}