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

Fix pads not stored in the correct folder the first time

Browse Source
This commit is contained in:
yflory 2018-06-19 11:04:39 +02:00
parent 9f9664eba1
commit c802b761c7
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
www/common/cryptpad-common.js
View File

@ -460,7 +460,7 @@ define([
if (typeof(meta) === "object") { if (typeof(meta) === "object") {
meta.defaultTitle = meta.title || meta.defaultTitle; meta.defaultTitle = meta.title || meta.defaultTitle;
delete meta.users; delete meta.users;
delete meta.title; meta.title = "";
} }
val = JSON.stringify(parsed); val = JSON.stringify(parsed);
} catch (e) { } catch (e) {
@ -489,6 +489,13 @@ define([
if (typeof (data.title) !== "string") { return cb('Missing title'); } if (typeof (data.title) !== "string") { return cb('Missing title'); }
if (data.title.trim() === "") { data.title = Hash.getDefaultName(parsed); } if (data.title.trim() === "") { data.title = Hash.getDefaultName(parsed); }
if (common.initialPath) {
if (!data.path) {
data.path = common.initialPath;
delete common.initialPath;
}
}
postMessage("SET_PAD_TITLE", data, function (obj) { postMessage("SET_PAD_TITLE", data, function (obj) {
if (obj && obj.error) { if (obj && obj.error) {
console.log("unable to set pad title"); console.log("unable to set pad title");
@ -837,7 +844,7 @@ define([
driveEvents: rdyCfg.driveEvents driveEvents: rdyCfg.driveEvents
}; };
if (sessionStorage[Constants.newPadPathKey]) { if (sessionStorage[Constants.newPadPathKey]) {
cfg.initialPath = sessionStorage[Constants.newPadPathKey]; common.initialPath = sessionStorage[Constants.newPadPathKey];
delete sessionStorage[Constants.newPadPathKey]; delete sessionStorage[Constants.newPadPathKey];
} }
AStore.query("CONNECT", cfg, waitFor(function (data) { AStore.query("CONNECT", cfg, waitFor(function (data) {