blitzwing/cryptpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
ansuz 2016-09-23 16:07:46 +02:00
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();
};