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

Update collapsed folders when renaming/moving/deleting folder in Drive

Browse Source
This commit is contained in:
ClemDee
2019-06-12 17:38:48 +02:00
parent 3a2dd5e0a8
commit 73c2964241
1 changed files with 44 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
www/drive/inner.js
View File

@@ -174,6 +174,31 @@ define([
APP.store[LS_OPENED] = JSON.stringify(stored); APP.store[LS_OPENED] = JSON.stringify(stored);
localStore.put(LS_OPENED, JSON.stringify(stored)); localStore.put(LS_OPENED, JSON.stringify(stored));
}; };
var removeFoldersOpened = function (parentPath) {
var stored = JSON.parse(APP.store[LS_OPENED] || '[]');
var s = JSON.stringify(parentPath).slice(0, -1);
for (var i = stored.length - 1 ; i >= 0 ; i--) {
if (stored[i].indexOf(s) === 0) {
stored.splice(i, 1);
}
}
APP.store[LS_OPENED] = JSON.stringify(stored);
localStore.put(LS_OPENED, JSON.stringify(stored));
};
var renameFoldersOpened = function (parentPath, newName) {
var stored = JSON.parse(APP.store[LS_OPENED] || '[]');
var s = JSON.stringify(parentPath).slice(0, -1);
var newParentPath = parentPath.slice();
newParentPath[newParentPath.length - 1] = newName;
var sNew = JSON.stringify(newParentPath).slice(0, -1);
for (var i = 0 ; i < stored.length ; i++) {
if (stored[i].indexOf(s) === 0) {
stored[i] = stored[i].replace(s, sNew);
}
}
APP.store[LS_OPENED] = JSON.stringify(stored);
localStore.put(LS_OPENED, JSON.stringify(stored));
};
var getViewModeClass = function () { var getViewModeClass = function () {
var mode = APP.store[LS_VIEWMODE]; var mode = APP.store[LS_VIEWMODE];
@@ -774,15 +799,19 @@ define([
e.stopPropagation(); e.stopPropagation();
if (e.which === 13) { if (e.which === 13) {
removeInput(true); removeInput(true);
var newName = $input.val();
if (JSON.stringify(path) === JSON.stringify(currentPath)) { if (JSON.stringify(path) === JSON.stringify(currentPath)) {
var newName = $input.val();
manager.rename(path, $input.val(), function () { manager.rename(path, $input.val(), function () {
renameFoldersOpened(path, newName);
path[path.length - 1] = newName; path[path.length - 1] = newName;
APP.displayDirectory(path); APP.displayDirectory(path);
}); });
} }
else { else {
manager.rename(path, $input.val(), refresh); manager.rename(path, $input.val(), function () {
renameFoldersOpened(path, newName);
refresh();
});
} }
return; return;
} }
@@ -1227,7 +1256,11 @@ define([
if (manager.isPathIn(newPath, [TRASH]) && paths.length && paths[0][0] === TRASH) { if (manager.isPathIn(newPath, [TRASH]) && paths.length && paths[0][0] === TRASH) {
return; return;
} }
manager.move(paths, newPath, cb, copy); var newCb = function () {
paths.forEach(removeFoldersOpened);
cb();
};
manager.move(paths, newPath, newCb, copy);
}; };
// Delete paths from the drive and/or shared folders (without moving them to the trash) // Delete paths from the drive and/or shared folders (without moving them to the trash)
var deletePaths = function (paths, pathsList) { var deletePaths = function (paths, pathsList) {
@@ -1254,7 +1287,10 @@ define([
UI.confirm(msg, function(res) { UI.confirm(msg, function(res) {
$(window).focus(); $(window).focus();
if (!res) { return; } if (!res) { return; }
manager.delete(pathsList, refresh); manager.delete(pathsList, function () {
pathsList.forEach(removeFoldersOpened);
refresh();
});
}, null, true); }, null, true);
}; };
// Drag & drop: // Drag & drop:
@@ -3242,7 +3278,10 @@ define([
UI.confirm(msgD, function(res) { UI.confirm(msgD, function(res) {
$(window).focus(); $(window).focus();
if (!res) { return; } if (!res) { return; }
manager.delete(pathsList, refresh); manager.delete(pathsList, function () {
pathsList.forEach(removeFoldersOpened);
refresh();
});
}); });
}; };
$contextMenu.on("click", "a", function(e) { $contextMenu.on("click", "a", function(e) {