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

fixed one last fight

Browse Source
This commit is contained in:
Caleb James DeLisle
2017-08-10 21:40:34 +02:00
parent 9c0b0cc6a8
commit 33e73dd5e5
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
www/pad2/outer.js
View File

@@ -19,10 +19,11 @@ define([
Cryptpad.ready(waitFor());
}).nThen(function (waitFor) {
var parsed = Cryptpad.parsePadUrl(window.location.href);
parsed.type = parsed.type.replace('pad2', 'pad');
if (!parsed.type) { throw new Error(); }
var defaultTitle = Cryptpad.getDefaultName(parsed);
var updateMeta = function () {
console.log('EV_METADATA_UPDATE');
//console.log('EV_METADATA_UPDATE');
var name;
nThen(function (waitFor) {
Cryptpad.getLastName(waitFor(function (n) { name = n }));
@@ -32,13 +33,13 @@ define([
defaultTitle: defaultTitle,
type: parsed.type
},
myID: Cryptpad.getNetwork().webChannels[0].myID,
user: {
name: name,
uid: Cryptpad.getUid(),
avatar: Cryptpad.getAvatarUrl(),
profile: Cryptpad.getProfileUrl(),
curvePublic: Cryptpad.getProxy().curvePublic
curvePublic: Cryptpad.getProxy().curvePublic,
netfluxId: Cryptpad.getNetwork().webChannels[0].myID,
}
});
});