From 2267ec8c43ddaaa60fa8c59cc82c2cf53c9ae8b0 Mon Sep 17 00:00:00 2001 From: yflory Date: Fri, 23 Sep 2016 15:12:07 +0200 Subject: [PATCH 1/2] Slides in read-only were not updated with the latest content --- www/slide/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/slide/main.js b/www/slide/main.js index 75d84ad02..9a68983cb 100644 --- a/www/slide/main.js +++ b/www/slide/main.js @@ -322,7 +322,7 @@ define([ elem.selectionStart = selects[0]; elem.selectionEnd = selects[1]; - Slide.update(content); + Slide.update(userDoc); notify(); }; From 37c3f127902df0134c456c7e8abf405eccc2e357 Mon Sep 17 00:00:00 2001 From: yflory Date: Fri, 23 Sep 2016 15:37:12 +0200 Subject: [PATCH 2/2] Use the new end_of_history message --- NetfluxWebsocketSrv.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NetfluxWebsocketSrv.js b/NetfluxWebsocketSrv.js index 80778864d..bfb8e4753 100644 --- a/NetfluxWebsocketSrv.js +++ b/NetfluxWebsocketSrv.js @@ -197,7 +197,8 @@ const handleMessage = function (ctx, user, msg) { storeMessage(ctx, ctx.channels[parsed[1]], JSON.stringify(key)); historyKeeperKeys[parsed[1]] = parsed[2]; } - sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, 0]); + let parsedMsg = {state: 1, channel: parsed[1]}; + sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, JSON.stringify(parsedMsg)]); }); } return;