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

Fix deletion from anon drive

Browse Source
This commit is contained in:
yflory 2020-03-11 12:34:43 +01:00
parent e31ddda8f5
commit 2f7e8fba79
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/common/drive-ui.js
View File

@ -3902,8 +3902,8 @@ define([
}; };
if (!APP.loggedIn) { if (!APP.loggedIn) {
$contextMenu.find('.cp-app-drive-context-delete').text(Messages.fc_remove) $contextMenu.find('.cp-app-drive-context-delete').attr('data-icon', faDelete)
.attr('data-icon', 'fa-eraser'); .html($contextMenu.find('.cp-app-drive-context-remove').html());
} }
var deleteOwnedPaths = function (paths, pathsList) { var deleteOwnedPaths = function (paths, pathsList) {
pathsList = pathsList || []; pathsList = pathsList || [];

1
www/common/proxy-manager.js
View File

@ -731,6 +731,7 @@ define([
// from inside a folder we're trying to delete // from inside a folder we're trying to delete
resolved.main.forEach(function (p) { resolved.main.forEach(function (p) {
var el = uo.find(p); var el = uo.find(p);
if (p[0] === UserObject.FILES_DATA) { return; }
if (uo.isFile(el) || uo.isSharedFolder(el)) { return; } if (uo.isFile(el) || uo.isSharedFolder(el)) { return; }
var arr = []; var arr = [];
uo.getFilesRecursively(el, arr); uo.getFilesRecursively(el, arr);