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

Fix an error when moving unsorted files to root in the drive

Browse Source
This commit is contained in:
yflory
2017-05-11 14:24:16 +02:00
parent b4973b7610
commit 371edff943
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
www/common/userObject.js
View File

@@ -840,21 +840,17 @@ define([
return; return;
} }
var rootFiles = getFiles([ROOT, TEMPLATE]).slice(); var rootFiles = getFiles([ROOT, TEMPLATE]).slice();
//var toClean = [];
var root = find([ROOT]); var root = find([ROOT]);
us.forEach(function (el) { us.forEach(function (el) {
if (!isFile(el) || rootFiles.indexOf(el) !== -1) { if (!isFile(el) || rootFiles.indexOf(el) !== -1) {
return; return;
//toClean.push(idx);
} }
var name = getFileData(el).title || NEW_FILE_NAME; var data = getFileData(el);
var name = data ? data.title : NEW_FILE_NAME;
var newName = getAvailableName(root, name); var newName = getAvailableName(root, name);
root[newName] = el; root[newName] = el;
}); });
delete files[UNSORTED]; delete files[UNSORTED];
/*toClean.forEach(function (idx) {
us.splice(idx, 1);
});*/
}; };
var fixTemplate = function () { var fixTemplate = function () {
if (!Array.isArray(files[TEMPLATE])) { debug("TEMPLATE was not an array"); files[TEMPLATE] = []; } if (!Array.isArray(files[TEMPLATE])) { debug("TEMPLATE was not an array"); files[TEMPLATE] = []; }