jab2870/Vim-Vixen
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

NavigateUseCase TabPresenter

Browse source
This commit is contained in:
Shin'ya Ueoka 2019-05-24 22:25:42 +09:00
parent 45a10d93c7
commit 03370301a7
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/background/presenters/TabPresenter.ts
View file

@ -36,7 +36,9 @@ export default class TabPresenter {
return tabId; return tabId;
} }
async getByKeyword(keyword: string, excludePinned: boolean = false): Promise<Tab[]> { async getByKeyword(
keyword: string, excludePinned: boolean = false,
): Promise<Tab[]> {
let tabs = await browser.tabs.query({ currentWindow: true }); let tabs = await browser.tabs.query({ currentWindow: true });
return tabs.filter((t) => { return tabs.filter((t) => {
return t.url && t.url.toLowerCase().includes(keyword.toLowerCase()) || return t.url && t.url.toLowerCase().includes(keyword.toLowerCase()) ||

4
src/background/usecases/NavigateUseCase.ts
View file

@ -33,9 +33,9 @@ export default class NavigateUseCase {
async openParent(): Promise<void> { async openParent(): Promise<void> {
let tab = await this.tabPresenter.getCurrent(); let tab = await this.tabPresenter.getCurrent();
let url = new URL(tab.url!!); let url = new URL(tab.url!!);
if (url.hash !== '') { if (url.hash.length > 0) {
url.hash = ''; url.hash = '';
} else if (url.search !== '') { } else if (url.search.length > 0) {
url.search = ''; url.search = '';
} else { } else {
const basenamePattern = /\/[^/]+$/; const basenamePattern = /\/[^/]+$/;