From 03370301a7509af4bbc96d60269598bf89c71fe4 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Fri, 24 May 2019 22:25:42 +0900 Subject: [PATCH] NavigateUseCase TabPresenter --- src/background/presenters/TabPresenter.ts | 4 +++- src/background/usecases/NavigateUseCase.ts | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/background/presenters/TabPresenter.ts b/src/background/presenters/TabPresenter.ts index 5e6e56e..ed88f26 100644 --- a/src/background/presenters/TabPresenter.ts +++ b/src/background/presenters/TabPresenter.ts @@ -36,7 +36,9 @@ export default class TabPresenter { return tabId; } - async getByKeyword(keyword: string, excludePinned: boolean = false): Promise { + async getByKeyword( + keyword: string, excludePinned: boolean = false, + ): Promise { let tabs = await browser.tabs.query({ currentWindow: true }); return tabs.filter((t) => { return t.url && t.url.toLowerCase().includes(keyword.toLowerCase()) || diff --git a/src/background/usecases/NavigateUseCase.ts b/src/background/usecases/NavigateUseCase.ts index ced2a0b..152339a 100644 --- a/src/background/usecases/NavigateUseCase.ts +++ b/src/background/usecases/NavigateUseCase.ts @@ -33,9 +33,9 @@ export default class NavigateUseCase { async openParent(): Promise { let tab = await this.tabPresenter.getCurrent(); let url = new URL(tab.url!!); - if (url.hash !== '') { + if (url.hash.length > 0) { url.hash = ''; - } else if (url.search !== '') { + } else if (url.search.length > 0) { url.search = ''; } else { const basenamePattern = /\/[^/]+$/;