alex/yomichan
1
Fork 0
Code Releases Activity

Pass options directly to translator.findTerms*

Browse Source
This commit is contained in:
toasted-nutbread 2019-09-07 12:35:57 -04:00
parent 91bc31d758
commit aae971a09e
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ext/bg/js/api.js
View File

@ -38,7 +38,8 @@ async function apiTermsFind(text) {
const {definitions, length} = await searcher( const {definitions, length} = await searcher(
text, text,
dictEnabledSet(options), dictEnabledSet(options),
options.scanning.alphanumeric options.scanning.alphanumeric,
options
); );
return { return {

6
ext/bg/js/translator.js
View File

@ -36,8 +36,7 @@ class Translator {
} }
} }
async findTermsGrouped(text, dictionaries, alphanumeric) { async findTermsGrouped(text, dictionaries, alphanumeric, options) {
const options = await apiOptionsGet();
const titles = Object.keys(dictionaries); const titles = Object.keys(dictionaries);
const {length, definitions} = await this.findTerms(text, dictionaries, alphanumeric); const {length, definitions} = await this.findTerms(text, dictionaries, alphanumeric);
@ -55,8 +54,7 @@ class Translator {
return {length, definitions: definitionsGrouped}; return {length, definitions: definitionsGrouped};
} }
async findTermsMerged(text, dictionaries, alphanumeric) { async findTermsMerged(text, dictionaries, alphanumeric, options) {
const options = await apiOptionsGet();
const secondarySearchTitles = Object.keys(options.dictionaries).filter(dict => options.dictionaries[dict].allowSecondarySearches); const secondarySearchTitles = Object.keys(options.dictionaries).filter(dict => options.dictionaries[dict].allowSecondarySearches);
const titles = Object.keys(dictionaries); const titles = Object.keys(dictionaries);
const {length, definitions} = await this.findTerms(text, dictionaries, alphanumeric); const {length, definitions} = await this.findTerms(text, dictionaries, alphanumeric);