aboutsummaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
Diffstat (limited to 'ext')
-rw-r--r--ext/bg/js/api.js4
-rw-r--r--ext/bg/js/backend.js2
-rw-r--r--ext/bg/js/search.js2
-rw-r--r--ext/bg/js/translator.js22
-rw-r--r--ext/fg/js/api.js4
-rw-r--r--ext/fg/js/frontend.js2
-rw-r--r--ext/mixed/js/display.js2
7 files changed, 19 insertions, 19 deletions
diff --git a/ext/bg/js/api.js b/ext/bg/js/api.js
index c50db76f..df73aa2a 100644
--- a/ext/bg/js/api.js
+++ b/ext/bg/js/api.js
@@ -72,9 +72,9 @@ async function apiOptionsSave(source) {
backend.onOptionsUpdated(source);
}
-async function apiTermsFind(text, optionsContext) {
+async function apiTermsFind(text, details, optionsContext) {
const options = await apiOptionsGet(optionsContext);
- const [definitions, length] = await utilBackend().translator.findTerms(text, options);
+ const [definitions, length] = await utilBackend().translator.findTerms(text, details, options);
definitions.splice(options.general.maxResults);
return {length, definitions};
}
diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 71393467..efad153a 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -179,7 +179,7 @@ Backend.messageHandlers = {
optionsGet: ({optionsContext}) => apiOptionsGet(optionsContext),
optionsSet: ({changedOptions, optionsContext, source}) => apiOptionsSet(changedOptions, optionsContext, source),
kanjiFind: ({text, optionsContext}) => apiKanjiFind(text, optionsContext),
- termsFind: ({text, optionsContext}) => apiTermsFind(text, optionsContext),
+ termsFind: ({text, details, optionsContext}) => apiTermsFind(text, details, optionsContext),
definitionAdd: ({definition, mode, context, optionsContext}) => apiDefinitionAdd(definition, mode, context, optionsContext),
definitionsAddable: ({definitions, modes, optionsContext}) => apiDefinitionsAddable(definitions, modes, optionsContext),
noteView: ({noteId}) => apiNoteView(noteId),
diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js
index ad579918..abd40640 100644
--- a/ext/bg/js/search.js
+++ b/ext/bg/js/search.js
@@ -207,7 +207,7 @@ class DisplaySearch extends Display {
this.setIntroVisible(!valid, animate);
this.updateSearchButton();
if (valid) {
- const {definitions} = await apiTermsFind(query, this.optionsContext);
+ const {definitions} = await apiTermsFind(query, {}, this.optionsContext);
this.setContentTerms(definitions, {
focus: false,
sentence: null,
diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index 1cdd79db..dac53f93 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -141,23 +141,23 @@ class Translator {
return result;
}
- async findTerms(text, options) {
+ async findTerms(text, details, options) {
switch (options.general.resultOutputMode) {
case 'group':
- return await this.findTermsGrouped(text, options);
+ return await this.findTermsGrouped(text, details, options);
case 'merge':
- return await this.findTermsMerged(text, options);
+ return await this.findTermsMerged(text, details, options);
case 'split':
- return await this.findTermsSplit(text, options);
+ return await this.findTermsSplit(text, details, options);
default:
return [[], 0];
}
}
- async findTermsGrouped(text, options) {
+ async findTermsGrouped(text, details, options) {
const dictionaries = dictEnabledSet(options);
const titles = Object.keys(dictionaries);
- const [definitions, length] = await this.findTermsInternal(text, dictionaries, options.scanning.alphanumeric);
+ const [definitions, length] = await this.findTermsInternal(text, dictionaries, options.scanning.alphanumeric, details);
const definitionsGrouped = dictTermsGroup(definitions, dictionaries);
await this.buildTermFrequencies(definitionsGrouped, titles);
@@ -171,11 +171,11 @@ class Translator {
return [definitionsGrouped, length];
}
- async findTermsMerged(text, options) {
+ async findTermsMerged(text, details, options) {
const dictionaries = dictEnabledSet(options);
const secondarySearchTitles = Object.keys(options.dictionaries).filter(dict => options.dictionaries[dict].allowSecondarySearches);
const titles = Object.keys(dictionaries);
- const [definitions, length] = await this.findTermsInternal(text, dictionaries, options.scanning.alphanumeric);
+ const [definitions, length] = await this.findTermsInternal(text, dictionaries, options.scanning.alphanumeric, details);
const {sequencedDefinitions, defaultDefinitions} = await this.getSequencedDefinitions(definitions, options.general.mainDictionary);
const definitionsMerged = [];
const mergedByTermIndices = new Set();
@@ -209,17 +209,17 @@ class Translator {
return [dictTermsSort(definitionsMerged), length];
}
- async findTermsSplit(text, options) {
+ async findTermsSplit(text, details, options) {
const dictionaries = dictEnabledSet(options);
const titles = Object.keys(dictionaries);
- const [definitions, length] = await this.findTermsInternal(text, dictionaries, options.scanning.alphanumeric);
+ const [definitions, length] = await this.findTermsInternal(text, dictionaries, options.scanning.alphanumeric, details);
await this.buildTermFrequencies(definitions, titles);
return [definitions, length];
}
- async findTermsInternal(text, dictionaries, alphanumeric) {
+ async findTermsInternal(text, dictionaries, alphanumeric, details) {
if (!alphanumeric && text.length > 0) {
const c = text[0];
if (!jpIsKana(c) && !jpIsKanji(c)) {
diff --git a/ext/fg/js/api.js b/ext/fg/js/api.js
index 54818702..945ba076 100644
--- a/ext/fg/js/api.js
+++ b/ext/fg/js/api.js
@@ -25,8 +25,8 @@ function apiOptionsSet(changedOptions, optionsContext, source) {
return utilInvoke('optionsSet', {changedOptions, optionsContext, source});
}
-function apiTermsFind(text, optionsContext) {
- return utilInvoke('termsFind', {text, optionsContext});
+function apiTermsFind(text, details, optionsContext) {
+ return utilInvoke('termsFind', {text, details, optionsContext});
}
function apiKanjiFind(text, optionsContext) {
diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index 7c62b51b..6002dfcb 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -413,7 +413,7 @@ class Frontend {
const searchText = textSource.text();
if (searchText.length === 0) { return null; }
- const {definitions, length} = await apiTermsFind(searchText, this.getOptionsContext());
+ const {definitions, length} = await apiTermsFind(searchText, {}, this.getOptionsContext());
if (definitions.length === 0) { return null; }
textSource.setEndOffset(length);
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index 801011df..8ad3ee1b 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -112,7 +112,7 @@ class Display {
try {
textSource.setEndOffset(this.options.scanning.length);
- ({definitions, length} = await apiTermsFind(textSource.text(), this.getOptionsContext()));
+ ({definitions, length} = await apiTermsFind(textSource.text(), {}, this.getOptionsContext()));
if (definitions.length === 0) {
return false;
}