infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Merge branch 'soon'

pull/1/head
yflory 2017-09-12 11:34:12 +02:00
parent 9d229b8868 ddbda08c88
commit 7d720c73a9
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
www/common/userObject.js
View File

@ -1012,7 +1012,7 @@ define([
var toClean = [];
us.forEach(function (el, idx) {
if (!isFile(el, true) || rootFiles.indexOf(el) !== -1) {
toClean.push(idx);
toClean.push(el);
}
if (typeof el === "string") {
// We have an old file (href) which is not in filesData: add it
@ -1024,12 +1024,15 @@ define([
var data = files[FILES_DATA][el];
if (!data) {
debug("An element in TEMPLATE doesn't have associated data", el);
toClean.push(idx);
toClean.push(el);
}
}
});
toClean.forEach(function (idx) {
us.splice(idx, 1);
toClean.forEach(function (el) {
var idx = us.indexOf(el);
if (idx !== -1) {
us.splice(idx, 1);
}
});
};
var migrateAttributes = function (el, id, parsed) {