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

manual merge of staging into framework

Browse Source
This commit is contained in:
Caleb James DeLisle
2017-09-26 17:11:45 +02:00
parent 77fe6a9bba cf6030ab8b
commit 342b6012f7
7 changed files with 17 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
www/common/loading.js
View File

@@ -36,7 +36,7 @@ define([], function () {
}
#cp-loading-tip {
position: fixed;
z-index: 100000;
z-index: 10000000;
top: 80%;
left: 0;
right: 0;

32
www/common/migrate-user-object.js
View File

@@ -7,41 +7,13 @@ define([], function () {
return function (userObject, Cryptpad) {
var version = userObject.version || 0;
// DEPRECATED
// Migration 1: pad attributes moved to filesData
var migratePadAttributesToData = function () {
var files = userObject && userObject.drive;
if (!files) { return; }
var migratePadAttributes = function (el, id, parsed) {
// Migrate old pad attributes
['userid', 'previewMode'].forEach(function (attr) {
var key = parsed.hash + '.' + attr;
var key2 = parsed.hash.slice(0,-1) + '.' + attr;// old pads not ending with /
if (typeof(files[key]) !== "undefined" || typeof(files[key2]) !== "undefined") {
console.log("Migrating pad attribute", attr, "for pad", id);
el[attr] = files[key] || files[key2];
delete files[key];
delete files[key2];
}
});
};
var filesData = files.filesData;
if (!filesData) { return; }
var el, parsed;
for (var id in filesData) {
id = Number(id);
el = filesData[id];
parsed = el.href && Cryptpad.parsePadUrl(el.href);
if (!parsed) { continue; }
migratePadAttributes(el, id, parsed);
}
// Migration done
return true;
};
if (version < 1) {
migratePadAttributesToData();
Cryptpad.feedback('Migrate-1', true);
userObject.version = version = 1;
}
// Migration 2: global attributes from root to 'settings' subobjects

2
www/common/sframe-chainpad-netflux-outer.js
View File

@@ -155,7 +155,9 @@ define([], function () {
// Do not remove wcObject, it allows us to use a new 'wc' without changing the handler if we
// want to keep the same chainpad (realtime) object
try {
if (window.Cryptpad_SUPPRESS_MSG) { return; }
wcObject.wc.bcast(message).then(function() {
if (window.Cryptpad_SUPPRESS_ACK) { return; }
cb();
}, function(err) {
// The message has not been sent, display the error.