From 728b0cb35f9e66b7b64ac1c3538b473fc646c15f Mon Sep 17 00:00:00 2001 From: Shin'ya UEOKA Date: Tue, 21 May 2019 23:33:31 +0000 Subject: Fix completion order --- src/background/usecases/CompletionsUseCase.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/background/usecases/CompletionsUseCase.ts b/src/background/usecases/CompletionsUseCase.ts index 705555b..8cd4f32 100644 --- a/src/background/usecases/CompletionsUseCase.ts +++ b/src/background/usecases/CompletionsUseCase.ts @@ -38,6 +38,9 @@ export default class CompletionsUseCase { } async queryOpen(name: string, keywords: string): Promise { + // TODO This logic contains view entities. They should be defined on + // content script + let settings = await this.settingRepository.get(); let groups: CompletionGroup[] = []; @@ -195,7 +198,7 @@ export default class CompletionsUseCase { .map(pages => filters.filterByPathname(pages, COMPLETION_ITEM_LIMIT)) .map(pages => filters.filterByOrigin(pages, COMPLETION_ITEM_LIMIT))[0] .sort((x: HistoryItem, y: HistoryItem): number => { - return Number(x.visitCount) - Number(y.visitCount); + return Number(y.visitCount) - Number(x.visitCount); }) .slice(0, COMPLETION_ITEM_LIMIT); return histories.map(page => ({ -- cgit v1.2.3 From 93f9e8219eac89d00ec710b646d18e47322d3e23 Mon Sep 17 00:00:00 2001 From: Shin'ya UEOKA Date: Wed, 22 May 2019 07:36:07 +0000 Subject: Prepare target='_blank' --- src/content/usecases/FollowSlaveUseCase.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/content/usecases/FollowSlaveUseCase.ts b/src/content/usecases/FollowSlaveUseCase.ts index a2cc80e..2bd16ee 100644 --- a/src/content/usecases/FollowSlaveUseCase.ts +++ b/src/content/usecases/FollowSlaveUseCase.ts @@ -63,16 +63,16 @@ export default class FollowSlaveUseCase { if (hint instanceof LinkHint) { let url = hint.getLink(); - // ignore taget='_blank' - if (!newTab && hint.getLinkTarget() === '_blank') { - hint.click(); - return; + let openNewTab = newTab; + // Open link by background script in order to prevent a popup block + if (hint.getLinkTarget() === '_blank') { + openNewTab = true; } // eslint-disable-next-line no-script-url if (!url || url === '#' || url.toLowerCase().startsWith('javascript:')) { return; } - await this.tabsClient.openUrl(url, newTab, background); + await this.tabsClient.openUrl(url, openNewTab, background); } else if (hint instanceof InputHint) { hint.activate(); } -- cgit v1.2.3 From ff85797ffcce6dffe9a36ec14e1d1efbba1c1e5b Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sun, 26 May 2019 21:39:38 +0900 Subject: Fix settings parsing --- src/shared/Settings.ts | 28 +++++++++++++++++----------- test/shared/Settings.test.ts | 4 ++++ 2 files changed, 21 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/shared/Settings.ts b/src/shared/Settings.ts index e1e2046..0bef342 100644 --- a/src/shared/Settings.ts +++ b/src/shared/Settings.ts @@ -101,17 +101,23 @@ export const blacklistValueOf = (o: any): string[] => { export const valueOf = (o: any): Settings => { let settings = { ...DefaultSetting }; - if (Object.prototype.hasOwnProperty.call(o, 'keymaps')) { - settings.keymaps = keymapsValueOf(o.keymaps); - } - if (Object.prototype.hasOwnProperty.call(o, 'search')) { - settings.search = searchValueOf(o.search); - } - if (Object.prototype.hasOwnProperty.call(o, 'properties')) { - settings.properties = propertiesValueOf(o.properties); - } - if (Object.prototype.hasOwnProperty.call(o, 'blacklist')) { - settings.blacklist = blacklistValueOf(o.blacklist); + for (let key of Object.keys(o)) { + switch (key) { + case 'keymaps': + settings.keymaps = keymapsValueOf(o.keymaps); + break; + case 'search': + settings.search = searchValueOf(o.search); + break; + case 'properties': + settings.properties = propertiesValueOf(o.properties); + break; + case 'blacklist': + settings.blacklist = blacklistValueOf(o.blacklist); + break; + default: + throw new TypeError('unknown setting: ' + key); + } } return settings; }; diff --git a/test/shared/Settings.test.ts b/test/shared/Settings.test.ts index 02cd022..04b28c4 100644 --- a/test/shared/Settings.test.ts +++ b/test/shared/Settings.test.ts @@ -186,5 +186,9 @@ describe('Settings', () => { expect(value.search.engines).to.be.an('object'); expect(value.blacklist).to.be.empty; }); + + it('throws a TypeError with an unknown field', () => { + expect(() => settings.valueOf({ name: 'alice' })).to.throw(TypeError) + }); }); }); -- cgit v1.2.3 From 37cd9d2f912c6df9b7ae7616f2fa53caafd6608d Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Mon, 27 May 2019 20:57:26 +0900 Subject: Set default engine and remain last engine on form settings --- src/settings/components/form/SearchForm.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/settings/components/form/SearchForm.tsx b/src/settings/components/form/SearchForm.tsx index cf78a69..6ba6cfb 100644 --- a/src/settings/components/form/SearchForm.tsx +++ b/src/settings/components/form/SearchForm.tsx @@ -54,6 +54,7 @@ class SearchForm extends React.Component { ; } + // eslint-disable-next-line max-statements bindValue(e: any) { let value = this.props.value.toJSON(); let name = e.target.name; @@ -72,8 +73,12 @@ class SearchForm extends React.Component { next.default = value.engines[index][0]; } else if (name === 'add') { next.engines.push(['', '']); - } else if (name === 'delete') { + } else if (name === 'delete' && value.engines.length > 1) { next.engines.splice(index, 1); + if (value.engines[index][0] === value.default) { + let nextIndex = Math.min(index, next.engines.length - 1); + next.default = next.engines[nextIndex][0]; + } } this.props.onChange(FormSearch.valueOf(next)); -- cgit v1.2.3 From c8f54a899d6c98f6c6dceae4841685ffc733365b Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Mon, 27 May 2019 21:06:15 +0900 Subject: Fix form keys --- src/settings/keymaps.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/settings/keymaps.ts b/src/settings/keymaps.ts index ffe0d48..2a66f9a 100644 --- a/src/settings/keymaps.ts +++ b/src/settings/keymaps.ts @@ -1,3 +1,5 @@ +/* eslint-disable max-len */ + const fields = [ [ ['scroll.vertically?{"count":1}', 'Scroll down'], @@ -19,8 +21,8 @@ const fields = [ ['tabs.close', 'Close a tab'], ['tabs.close.right', 'Close tabs to the right'], ['tabs.reopen', 'Reopen closed tab'], - ['tabs.next?{"count":1}', 'Select next Tab'], - ['tabs.prev?{"count":1}', 'Select prev Tab'], + ['tabs.next', 'Select next Tab'], + ['tabs.prev', 'Select prev Tab'], ['tabs.first', 'Select first tab'], ['tabs.last', 'Select last tab'], ['tabs.reload?{"cache":false}', 'Reload current tab'], @@ -28,8 +30,8 @@ const fields = [ ['tabs.pin.toggle', 'Toggle pinned state'], ['tabs.duplicate', 'Duplicate a tab'], ], [ - ['follow.start?{"newTab":false}', 'Follow a link'], - ['follow.start?{"newTab":true}', 'Follow a link in new tab'], + ['follow.start?{"newTab":false,"background":false}', 'Follow a link'], + ['follow.start?{"newTab":true,"background":false}', 'Follow a link in new tab'], ['navigate.history.prev', 'Go back in histories'], ['navigate.history.next', 'Go forward in histories'], ['navigate.link.next', 'Open next link'], @@ -37,7 +39,7 @@ const fields = [ ['navigate.parent', 'Go to parent directory'], ['navigate.root', 'Go to root directory'], ['page.source', 'Open page source'], - ['page.home', 'Open start page to current tab'], + ['page.home?{"newTab":false}', 'Open start page to current tab'], ['page.home?{"newTab":true}', 'Open start page in new tab'], ['focus.input', 'Focus input'], ], [ -- cgit v1.2.3 From 698f905145755954647f91ae01f5966b9e35a91e Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Mon, 27 May 2019 21:09:36 +0900 Subject: Save settings on switching a source --- src/settings/components/index.tsx | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/settings/components/index.tsx b/src/settings/components/index.tsx index b4a0866..eeac2cf 100644 --- a/src/settings/components/index.tsx +++ b/src/settings/components/index.tsx @@ -175,6 +175,7 @@ class SettingsComponent extends React.Component { if (from === 'form' && value === 'json') { this.props.dispatch(settingActions.switchToJson( this.props.form as FormSettings)); + this.save(); } else if (from === 'json' && value === 'form') { let b = window.confirm(DO_YOU_WANT_TO_CONTINUE); if (!b) { @@ -183,6 +184,7 @@ class SettingsComponent extends React.Component { } this.props.dispatch( settingActions.switchToForm(this.props.json as JSONSettings)); + this.save(); } } -- cgit v1.2.3