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

resolve conflicts from merge with staging

Browse Source
This commit is contained in:
ansuz
2018-06-20 14:29:13 +02:00
parent d03339f20b a5b207d57b
commit c3741f847d
12 changed files with 413 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -475,7 +475,7 @@ define([
if (typeof(meta) === "object") {
meta.defaultTitle = meta.title || meta.defaultTitle;
delete meta.users;
delete meta.title;
meta.title = "";
}
val = JSON.stringify(parsed);
} catch (e) {
@@ -504,6 +504,13 @@ define([
if (typeof (data.title) !== "string") { return cb('Missing title'); }
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) {
if (obj && obj.error) {
console.log("unable to set pad title");
@@ -699,6 +706,9 @@ define([
common.getFullHistory = function (data, cb) {
postMessage("GET_FULL_HISTORY", data, cb);
};
common.getHistoryRange = function (data, cb) {
postMessage("GET_HISTORY_RANGE", data, cb);
};
common.getShareHashes = function (secret, cb) {
var hashes;
@@ -935,7 +945,7 @@ define([
driveEvents: rdyCfg.driveEvents // Boolean
};
if (sessionStorage[Constants.newPadPathKey]) {
cfg.initialPath = sessionStorage[Constants.newPadPathKey];
common.initialPath = sessionStorage[Constants.newPadPathKey];
delete sessionStorage[Constants.newPadPathKey];
}