summaryrefslogtreecommitdiff
path: root/src/client/rz_core.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_core.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_core.js')
-rw-r--r--src/client/rz_core.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/client/rz_core.js b/src/client/rz_core.js
index 51f7eaec..6f712e8c 100644
--- a/src/client/rz_core.js
+++ b/src/client/rz_core.js
@@ -1,7 +1,7 @@
"use strict"
-define(['jquery', 'd3', 'consts', 'rz_bus', 'util', 'model/graph', 'model/core', 'view/item_info', 'rz_observer', 'view/selection', 'rz_mesh', 'model/diff', "view/graph_view", 'view/svg_input', 'view/filter_menu'],
-function($, d3, consts, rz_bus, util, model_graph, model_core, item_info, rz_observer, selection, rz_mesh, model_diff, graph_view, svg_input, filter_menu) {
+define(['jquery', 'd3', 'consts', 'rz_bus', 'util', 'model/graph', 'model/core', 'view/item_info', 'rz_observer', 'view/selection', 'rz_mesh', 'model/diff', "view/graph_view", 'view/svg_input', 'view/filter_menu', 'view/activity'],
+function($, d3, consts, rz_bus, util, model_graph, model_core, item_info, rz_observer, selection, rz_mesh, model_diff, graph_view, svg_input, filter_menu, activity) {
// fix circular module dependency
var search;
@@ -203,6 +203,7 @@ function init_ws_connection(){
function init() {
initDrawingArea();
init_ws_connection();
+ activity.init($('.graph-view'));
if (rz_config.backend_enabled) {
var cur_rzdoc_name = rzdoc__current__get_name();