From 4e86f7f3083c882f48a4a96f4292813b6813fc60 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Sun, 17 Jan 2021 16:02:19 +0200 Subject: [PATCH] refactor(dom) loadCurrentSize: callback -> promise --- client/dom/index.js | 4 ++-- client/key/index.js | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client/dom/index.js b/client/dom/index.js index 044217b1..568c86b3 100644 --- a/client/dom/index.js +++ b/client/dom/index.js @@ -225,7 +225,7 @@ function CmdProto() { * get size * @currentFile */ - this.loadCurrentSize = callbackify(async (currentFile) => { + this.loadCurrentSize = async (currentFile) => { const current = currentFile || DOM.getCurrentFile(); const query = '?size'; const link = DOM.getCurrentPath(current); @@ -241,7 +241,7 @@ function CmdProto() { Images.hide(); return current; - }); + }; /** * load hash diff --git a/client/key/index.js b/client/key/index.js index f85285b7..b8d2c333 100644 --- a/client/key/index.js +++ b/client/key/index.js @@ -281,18 +281,18 @@ async function switchKey(event) { break; case KEY.SPACE: + event.preventDefault(); + if (!isDir || name === '..') isSelected = true; else isSelected = DOM.isSelected(current); - exec.if(isSelected, () => { - DOM.toggleSelectedFile(current); - }, (callback) => { - DOM.loadCurrentSize(current, callback); - }); + if (!isSelected) + await DOM.loadCurrentSize(current); + + DOM.toggleSelectedFile(current); - event.preventDefault(); break; case KEY.U: