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

Set the url if there is none

Browse Source
This commit is contained in:
Caleb James DeLisle
2017-08-11 10:40:57 +02:00
parent 33e73dd5e5
commit 4acd9957a9
4 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
www/pad2/outer.js
View File

@@ -18,6 +18,10 @@ define([
}));
Cryptpad.ready(waitFor());
}).nThen(function (waitFor) {
var secret = Cryptpad.getSecrets();
var readOnly = secret.keys && !secret.keys.editKeyStr;
if (!secret.keys) { secret.keys = secret.key; }
var parsed = Cryptpad.parsePadUrl(window.location.href);
parsed.type = parsed.type.replace('pad2', 'pad');
if (!parsed.type) { throw new Error(); }
@@ -55,10 +59,6 @@ define([
}
});
var secret = Cryptpad.getSecrets();
var readOnly = secret.keys && !secret.keys.editKeyStr;
if (!secret.keys) { secret.keys = secret.key; }
CpNfOuter.start({
sframeChan: sframeChan,
channel: secret.channel,
@@ -66,6 +66,10 @@ define([
validateKey: secret.keys.validateKey || undefined,
readOnly: readOnly,
crypto: Crypto.createEncryptor(secret.keys),
onConnect: function (wc) {
if (readOnly) { return; }
Cryptpad.replaceHash(Cryptpad.getEditHashFromKeys(wc.id, secret.keys));
}
});
});
});