Merge branch 'newhashNoConflict' of github.com:xwiki-labs/cryptpad into newhashNoConflict

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;

www/slide/main.js

@@ -322,7 +322,7 @@ define([
         elem.selectionStart = selects[0];
         elem.selectionEnd = selects[1];
 
-        Slide.update(content);
+        Slide.update(userDoc);
 
         notify();
     };