web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'staging' into locks

Browse Source
This commit is contained in:
yflory
2019-01-24 16:27:15 +01:00
parent 024eafaf32 e993925d81
commit ed4f8016a1
42 changed files with 663 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
www/common/sframe-common.js
View File

@@ -197,7 +197,10 @@ define([
};
funcs.openCursorChannel = function (saveChanges) {
var md = JSON.parse(JSON.stringify(ctx.metadataMgr.getMetadata()));
var channel = md.cursor || Hash.createChannelId();
var channel = md.cursor;
if (typeof(channel) !== 'string' || channel.length !== Hash.ephemeralChannelLength) {
channel = Hash.createChannelId(true); // true indicates that it's an ephemeral channel
}
if (!md.cursor) {
md.cursor = channel;
ctx.metadataMgr.updateMetadata(md);