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

Move open parent and open root to background

Browse source
This commit is contained in:
Shin'ya Ueoka 2019-05-24 21:51:18 +09:00
parent e779fb1779
commit 8d0739463d
8 changed files with 108 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/background/controllers/OperationController.ts
View file

@ -84,6 +84,10 @@ export default class OperationController {
return this.navigateUseCase.openLinkPrev();
case operations.NAVIGATE_LINK_NEXT:
return this.navigateUseCase.openLinkNext();
case operations.NAVIGATE_PARENT:
return this.navigateUseCase.openParent();
case operations.NAVIGATE_ROOT:
return this.navigateUseCase.openRoot();
}
throw new Error('unknown operation: ' + operation.type);
}

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

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

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

@ -30,11 +30,28 @@ export default class NavigateUseCase {
await this.navigateClient.linkPrev(tab.id!!);
}
openParent(): Promise<void> {
throw new Error('not implemented');
async openParent(): Promise<void> {
let tab = await this.tabPresenter.getCurrent();
let url = new URL(tab.url!!);
if (url.hash !== '') {
url.hash = '';
} else if (url.search !== '') {
url.search = '';
} else {
const basenamePattern = /\/[^/]+$/;
const lastDirPattern = /\/[^/]+\/$/;
if (basenamePattern.test(url.pathname)) {
url.pathname = url.pathname.replace(basenamePattern, '/');
} else if (lastDirPattern.test(url.pathname)) {
url.pathname = url.pathname.replace(lastDirPattern, '/');
}
}
await this.tabPresenter.open(url.href);
}
openRoot(): Promise<void> {
throw new Error('not implemented');
async openRoot(): Promise<void> {
let tab = await this.tabPresenter.getCurrent();
let url = new URL(tab.url!!);
await this.tabPresenter.open(url.origin);
}
}

8
src/content/controllers/KeymapController.ts
View file

@ -4,7 +4,6 @@ import KeymapUseCase from '../usecases/KeymapUseCase';
import AddonEnabledUseCase from '../usecases/AddonEnabledUseCase';
import FindSlaveUseCase from '../usecases/FindSlaveUseCase';
import ScrollUseCase from '../usecases/ScrollUseCase';
import NavigateUseCase from '../usecases/NavigateUseCase';
import FocusUseCase from '../usecases/FocusUseCase';
import ClipboardUseCase from '../usecases/ClipboardUseCase';
import BackgroundClient from '../client/BackgroundClient';
@ -19,7 +18,6 @@ export default class KeymapController {
private addonEnabledUseCase: AddonEnabledUseCase,
private findSlaveUseCase: FindSlaveUseCase,
private scrollUseCase: ScrollUseCase,
private navigateUseCase: NavigateUseCase,
private focusUseCase: FocusUseCase,
private clipbaordUseCase: ClipboardUseCase,
private backgroundClient: BackgroundClient,
@ -84,12 +82,6 @@ export default class KeymapController {
case operations.MARK_JUMP_PREFIX:
this.markKeyUseCase.enableJumpMode();
break;
case operations.NAVIGATE_PARENT:
this.navigateUseCase.openParent();
break;
case operations.NAVIGATE_ROOT:
this.navigateUseCase.openRoot();
break;
case operations.FOCUS_INPUT:
this.focusUseCase.focusFirstInput();
break;

27
src/content/presenters/NavigationPresenter.ts
View file

@ -6,10 +6,6 @@ export default interface NavigationPresenter {
openLinkPrev(): void;
openLinkNext(): void;
openParent(): void;
openRoot(): void;
}
const REL_PATTERN: {[key: string]: RegExp} = {
@ -51,29 +47,6 @@ export class NavigationPresenterImpl implements NavigationPresenter {
this.linkRel('next');
}
openParent(): void {
const loc = window.location;
if (loc.hash !== '') {
loc.hash = '';
return;
} else if (loc.search !== '') {
loc.search = '';
return;
}
const basenamePattern = /\/[^/]+$/;
const lastDirPattern = /\/[^/]+\/$/;
if (basenamePattern.test(loc.pathname)) {
loc.pathname = loc.pathname.replace(basenamePattern, '/');
} else if (lastDirPattern.test(loc.pathname)) {
loc.pathname = loc.pathname.replace(lastDirPattern, '/');
}
}
openRoot(): void {
window.location.href = window.location.origin;
}
// Code common to linkPrev and linkNext which navigates to the specified page.
private linkRel(rel: 'prev' | 'next'): void {
let link = selectLast<HTMLLinkElement>(`link[rel~=${rel}][href]`);

8
src/content/usecases/NavigateUseCase.ts
View file

@ -24,12 +24,4 @@ export default class NavigateUseCase {
openLinkNext(): void {
this.navigationPresenter.openLinkNext();
}
openParent(): void {
this.navigationPresenter.openParent();
}
openRoot(): void {
this.navigationPresenter.openRoot();
}
}

82
test/background/usecases/NavigateUseCase.test.ts Normal file
View file

@ -0,0 +1,82 @@
import TabPresenter from '../../../src/background/presenters/TabPresenter';
import NavigateUseCase from '../../../src/background/usecases/NavigateUseCase';
import NavigateClient from '../../../src/background/clients/NavigateClient';
// import { expect } from 'chai';
import * as sinon from 'sinon';
describe('NavigateUseCase', () => {
let sut: NavigateUseCase;
let tabPresenter: TabPresenter;
let navigateClient: NavigateClient;
beforeEach(() => {
tabPresenter = new TabPresenter();
navigateClient = new NavigateClient();
sut = new NavigateUseCase(tabPresenter, navigateClient);
});
describe('#openParent()', async () => {
it.only('opens parent directory of file', async() => {
var stub = sinon.stub(tabPresenter, 'getCurrent');
stub.returns(Promise.resolve({ url: 'https://google.com/fruits/yellow/banana' }))
var mock = sinon.mock(tabPresenter);
mock.expects('open').withArgs('https://google.com/fruits/yellow/');
await sut.openParent();
mock.verify();
});
it.only('opens parent directory of directory', async() => {
var stub = sinon.stub(tabPresenter, 'getCurrent');
stub.returns(Promise.resolve({ url: 'https://google.com/fruits/yellow/' }))
var mock = sinon.mock(tabPresenter);
mock.expects('open').withArgs('https://google.com/fruits/');
await sut.openParent();
mock.verify();
});
it.only('removes hash', async() => {
var stub = sinon.stub(tabPresenter, 'getCurrent');
stub.returns(Promise.resolve({ url: 'https://google.com/#top' }))
var mock = sinon.mock(tabPresenter);
mock.expects('open').withArgs('https://google.com/');
await sut.openParent();
mock.verify();
});
it.only('removes search query', async() => {
var stub = sinon.stub(tabPresenter, 'getCurrent');
stub.returns(Promise.resolve({ url: 'https://google.com/search?q=apple' }))
var mock = sinon.mock(tabPresenter);
mock.expects('open').withArgs('https://google.com/search');
await sut.openParent();
mock.verify();
});
});
describe('#openRoot()', () => {
it.only('opens root direectory', async() => {
var stub = sinon.stub(tabPresenter, 'getCurrent');
stub.returns(Promise.resolve({
url: 'https://google.com/seach?q=apple',
}))
var mock = sinon.mock(tabPresenter);
mock.expects('open').withArgs('https://google.com');
await sut.openRoot();
mock.verify();
});
});
});

9
test/content/presenters/NavigationPresenter.test.ts
View file

@ -132,13 +132,4 @@ describe('NavigationPresenter', () => {
'<a href="#dummy">next page</a><a rel="next" href="#next">click me</a>'
));
});
describe('#parent', () => {
// NOTE: not able to test location
it('removes hash', () => {
window.location.hash = '#section-1';
sut.openParent();
expect(document.location.hash).to.be.empty;
});
});
});