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

Move pad attributes in pad data

Browse Source
This commit is contained in:
yflory
2017-07-05 12:21:01 +02:00
parent 3e802c2443
commit 43ac71603c
6 changed files with 81 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
www/poll/main.js
View File

@@ -552,11 +552,19 @@ var ready = function (info, userid, readOnly) {
} else {
APP.proxy.info.defaultTitle = Title.defaultTitle;
}
var andThen = function () {
if (readOnly) { return; }
Cryptpad.setPadAttribute('userid', userid, function (e) {
if (e) { console.error(e); }
});
};
if (Cryptpad.initialName && !APP.proxy.info.title) {
APP.proxy.info.title = Cryptpad.initialName;
Title.updateTitle(Cryptpad.initialName);
Title.updateTitle(Cryptpad.initialName, null, andThen);
} else {
Title.updateTitle(APP.proxy.info.title || Title.defaultTitle);
Title.updateTitle(APP.proxy.info.title || Title.defaultTitle, null, andThen);
}
// Description
@@ -621,6 +629,7 @@ var ready = function (info, userid, readOnly) {
} else {
publish(true);
}
Cryptpad.removeLoadingScreen();
if (readOnly) { return; }
@@ -760,10 +769,7 @@ var create = function (info) {
if (e) { console.error(e); }
if (!userid) { userid = Render.coluid(); }
APP.userid = userid;
Cryptpad.setPadAttribute('userid', userid, function (e) {
if (e) { console.error(e); }
ready(info, userid, readOnly);
});
ready(info, userid, readOnly);
});
})
.on('disconnect', disconnect)