From c03ab2862bf1fe015a0f7e9d9baf6738d639d425 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Thu, 27 Dec 2018 19:17:07 +0900 Subject: Add close tabs to the right command --- src/background/controllers/operation.js | 2 ++ src/background/usecases/operation.js | 12 ++++++++++++ 2 files changed, 14 insertions(+) (limited to 'src/background') diff --git a/src/background/controllers/operation.js b/src/background/controllers/operation.js index aea85fc..646f50e 100644 --- a/src/background/controllers/operation.js +++ b/src/background/controllers/operation.js @@ -11,6 +11,8 @@ export default class OperationController { switch (operation.type) { case operations.TAB_CLOSE: return this.operationInteractor.close(false); + case operations.TAB_CLOSE_RIGHT: + return this.operationInteractor.closeRight(); case operations.TAB_CLOSE_FORCE: return this.operationInteractor.close(true); case operations.TAB_REOPEN: diff --git a/src/background/usecases/operation.js b/src/background/usecases/operation.js index bf905be..74f484e 100644 --- a/src/background/usecases/operation.js +++ b/src/background/usecases/operation.js @@ -21,6 +21,18 @@ export default class OperationInteractor { return this.tabPresenter.remove([tab.id]); } + async closeRight() { + let tabs = await this.tabPresenter.getAll(); + tabs.sort((t1, t2) => t1.index - t2.index); + let index = tabs.findIndex(t => t.active); + if (index < 0) { + return; + } + for (let i = index + 1; i < tabs.length; ++i) { + this.tabPresenter.remove(tabs[i].id); + } + } + reopen() { return this.tabPresenter.reopen(); } -- cgit v1.2.3 From 54bbe4ecbdb53dddd97db18581edb0704b4cb76f Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Thu, 27 Dec 2018 20:06:32 +0900 Subject: Close only unpinned tabs; --- src/background/usecases/operation.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/background') diff --git a/src/background/usecases/operation.js b/src/background/usecases/operation.js index 74f484e..dd24e75 100644 --- a/src/background/usecases/operation.js +++ b/src/background/usecases/operation.js @@ -29,7 +29,10 @@ export default class OperationInteractor { return; } for (let i = index + 1; i < tabs.length; ++i) { - this.tabPresenter.remove(tabs[i].id); + let tab = tabs[i]; + if (!tab.pinned) { + this.tabPresenter.remove(tab.id); + } } } -- cgit v1.2.3