From aacb1af6b58e5641b37d947219eb13cecc61052f Mon Sep 17 00:00:00 2001 From: coderaiser Date: Sun, 1 Jul 2018 22:23:01 +0300 Subject: [PATCH] fix(operation) next current file after delete --- client/modules/operation/index.js | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/client/modules/operation/index.js b/client/modules/operation/index.js index f01ebcd5..9401b2ed 100644 --- a/client/modules/operation/index.js +++ b/client/modules/operation/index.js @@ -263,20 +263,18 @@ function deleteSilent(files = DOM.getActiveFiles()) { const removedNames = DOM.getFilenames(files); const names = DOM.CurrentInfo.files.map(DOM.getCurrentName); - const prevCurrent = DOM.getCurrentName(); - const currentName = getNextCurrentName(prevCurrent, names, removedNames); + const currentName = DOM.getCurrentName(); + const nextCurrentName = getNextCurrentName(currentName, names, removedNames); - deleteFn(path + query, removedNames, (e) => { - const Storage = DOM.Storage; - const dirPath = Info.dirPath; - - DOM.setCurrentByName(prevCurrent); - - !e && CloudCmd.refresh({ - currentName + deleteFn(path + query, removedNames, () => { + CloudCmd.refresh(() => { + const names = Info.files.map(DOM.getCurrentName); + const isCurrent = names.includes(currentName); + + let name = isCurrent ? currentName : nextCurrentName; + + DOM.setCurrentByName(name); }); - - Storage.removeMatch(dirPath); }); }