blitzwing/cryptpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix lint errors

Browse source
This commit is contained in:
yflory 2017-04-13 15:04:17 +02:00
parent 3ba90332bb
commit eb2a3c1bbf
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
www/common/userObject.js
View file

@ -179,8 +179,6 @@ define([
// FIND // FIND
var compareFiles = function (fileA, fileB) { return fileA === fileB; };
var findElement = function (root, pathInput) { var findElement = function (root, pathInput) {
if (!pathInput) { if (!pathInput) {
error("Invalid path:\n", pathInput, "\nin root\n", root); error("Invalid path:\n", pathInput, "\nin root\n", root);
@ -472,14 +470,14 @@ define([
// Move to Trash // Move to Trash
if (isPathIn(newParentPath, [TRASH])) { if (isPathIn(newParentPath, [TRASH])) {
if (!elementPath || elementPath.length < 2 || elementPath[0] === TRASH) { if (!elementPath || elementPath.length < 2 || elementPath[0] === TRASH) {
debug("Can't move an element from the trash to the trash: ", path); debug("Can't move an element from the trash to the trash: ", elementPath);
return; return;
} }
var key = elementPath[elementPath.length - 1]; var key = elementPath[elementPath.length - 1];
var name = isPathIn(elementPath, ['hrefArray']) ? getTitle(element) : key; var elName = isPathIn(elementPath, ['hrefArray']) ? getTitle(element) : key;
var parentPath = elementPath.slice(); var parentPath = elementPath.slice();
parentPath.pop(); parentPath.pop();
pushToTrash(name, element, parentPath); pushToTrash(elName, element, parentPath);
return true; return true;
} }
// Move to hrefArray // Move to hrefArray
@ -646,7 +644,7 @@ define([
files[TRASH][obj.name].splice(idx, 1); files[TRASH][obj.name].splice(idx, 1);
}); });
}; };
var deleteMultiplePermanently = function (paths) { var deleteMultiplePermanently = function (paths, nocheck) {
var hrefPaths = paths.filter(function(x) { return isPathIn(x, ['hrefArray']); }); var hrefPaths = paths.filter(function(x) { return isPathIn(x, ['hrefArray']); });
var rootPaths = paths.filter(function(x) { return isPathIn(x, [ROOT]); }); var rootPaths = paths.filter(function(x) { return isPathIn(x, [ROOT]); });
var trashPaths = paths.filter(function(x) { return isPathIn(x, [TRASH]); }); var trashPaths = paths.filter(function(x) { return isPathIn(x, [TRASH]); });
@ -689,10 +687,12 @@ define([
}); });
deleteMultipleTrashRoot(trashRoot); deleteMultipleTrashRoot(trashRoot);
checkDeletedFiles(); // In some cases, we want to remove pads from a location without removing them from
// FILES_DATA (replaceHref)
if (!nocheck) { checkDeletedFiles(); }
}; };
var deletePath = exp.delete = function (paths, cb) { var deletePath = exp.delete = function (paths, cb, nocheck) {
deleteMultiplePermanently(paths); deleteMultiplePermanently(paths, nocheck);
if (typeof cb === "function") { cb(); } if (typeof cb === "function") { cb(); }
}; };
var emptyTrash = exp.emptyTrash = function (cb) { var emptyTrash = exp.emptyTrash = function (cb) {
@ -754,7 +754,7 @@ define([
var allInTrash = true; var allInTrash = true;
paths.forEach(function (p) { paths.forEach(function (p) {
if (p[0] === TRASH) { if (p[0] === TRASH) {
removeFromTrash(p, null, true); // 3rd parameter means skip "checkDeletedFiles" exp.delete(p, null, true); // 3rd parameter means skip "checkDeletedFiles"
return; return;
} else { } else {
allInTrash = false; allInTrash = false;