From bab8066af8eafec67448fb473f8c021d85ab06bd Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Wed, 29 Aug 2018 22:07:32 +0900 Subject: [PATCH] Add complete property --- src/background/usecases/completions.js | 33 +++++++++++++++++--------- src/shared/settings/default.js | 3 ++- src/shared/settings/properties.js | 3 +++ 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/src/background/usecases/completions.js b/src/background/usecases/completions.js index 9385760..2dc71cc 100644 --- a/src/background/usecases/completions.js +++ b/src/background/usecases/completions.js @@ -36,18 +36,29 @@ export default class CompletionsInteractor { } async queryOpen(name, keywords) { + let settings = await this.settingRepository.get(); let groups = []; - let engines = await this.querySearchEngineItems(name, keywords); - if (engines.length > 0) { - groups.push(new CompletionGroup('Search Engines', engines)); - } - let histories = await this.queryHistoryItems(name, keywords); - if (histories.length > 0) { - groups.push(new CompletionGroup('History', histories)); - } - let bookmarks = await this.queryBookmarkItems(name, keywords); - if (bookmarks.length > 0) { - groups.push(new CompletionGroup('Bookmarks', bookmarks)); + + for (let c of settings.properties.complete) { + if (c === 's') { + // eslint-disable-next-line no-await-in-loop + let engines = await this.querySearchEngineItems(name, keywords); + if (engines.length > 0) { + groups.push(new CompletionGroup('Search Engines', engines)); + } + } else if (c === 'h') { + // eslint-disable-next-line no-await-in-loop + let histories = await this.queryHistoryItems(name, keywords); + if (histories.length > 0) { + groups.push(new CompletionGroup('History', histories)); + } + } else if (c === 'b') { + // eslint-disable-next-line no-await-in-loop + let bookmarks = await this.queryBookmarkItems(name, keywords); + if (bookmarks.length > 0) { + groups.push(new CompletionGroup('Bookmarks', bookmarks)); + } + } } return new Completions(groups); } diff --git a/src/shared/settings/default.js b/src/shared/settings/default.js index 55dbc3a..6feb9ec 100644 --- a/src/shared/settings/default.js +++ b/src/shared/settings/default.js @@ -72,7 +72,8 @@ export default { "properties": { "hintchars": "abcdefghijklmnopqrstuvwxyz", "smoothscroll": false, - "adjacenttab": true + "adjacenttab": true, + "complete": "sbh" }, "blacklist": [ ] diff --git a/src/shared/settings/properties.js b/src/shared/settings/properties.js index e8d06da..284de6c 100644 --- a/src/shared/settings/properties.js +++ b/src/shared/settings/properties.js @@ -6,6 +6,7 @@ const types = { hintchars: 'string', smoothscroll: 'boolean', adjacenttab: 'boolean', + complete: 'string', }; // describe default values of a property @@ -13,12 +14,14 @@ const defaults = { hintchars: 'abcdefghijklmnopqrstuvwxyz', smoothscroll: false, adjacenttab: true, + complete: 'sbn', }; const docs = { hintchars: 'hint characters on follow mode', smoothscroll: 'smooth scroll', adjacenttab: 'open adjacent tabs', + complete: 'which are completed at the open page', }; export { types, defaults, docs };