infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

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

pull/1/head
ansuz 2016-09-23 16:07:46 +02:00
parent a82b7aaf8b 37c3f12790
commit a4843cb5d7
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NetfluxWebsocketSrv.js
View File

@ -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;

2
www/slide/main.js
View File

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