summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortoasted-nutbread <toasted-nutbread@users.noreply.github.com>2019-10-24 20:21:21 -0400
committertoasted-nutbread <toasted-nutbread@users.noreply.github.com>2019-10-28 17:03:42 -0400
commitbe27781c150bc081cc65c06b0a08d7b49044cbf3 (patch)
treefe754bc9e22e5a0e81da595c0b0c413c63c77ffc
parentf927f806ba602867948654947dce4d27dfc07ebf (diff)
Update how definitions are searched for
-rw-r--r--ext/fg/js/frontend.js72
1 files changed, 29 insertions, 43 deletions
diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index 1ab3c1a1..52fdaacf 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -337,12 +337,18 @@ class Frontend {
}
async searchSource(textSource, cause) {
- let hideResults = false;
+ let results = null;
try {
this.pendingLookup = true;
- const focus = (cause === 'mouse');
- hideResults = !await this.searchTerms(textSource, focus) && !await this.searchKanji(textSource, focus);
+ results = (
+ await this.findTerms(textSource) ||
+ await this.findKanji(textSource)
+ );
+ if (results !== null) {
+ const focus = (cause === 'mouse');
+ this.showContent(textSource, focus, results.definitions, results.type);
+ }
} catch (e) {
if (window.yomichan_orphaned) {
if (textSource && this.options.scanning.modifier !== 'none') {
@@ -356,7 +362,7 @@ class Frontend {
this.onError(e);
}
} finally {
- if (hideResults && this.options.scanning.autoHideResults) {
+ if (results === null && this.options.scanning.autoHideResults) {
this.searchClear(true);
}
@@ -365,27 +371,13 @@ class Frontend {
}
}
- async searchTerms(textSource, focus) {
- this.setTextSourceScanLength(textSource, this.options.scanning.length);
-
- const searchText = textSource.text();
- if (searchText.length === 0) {
- return false;
- }
-
- const {definitions, length} = await apiTermsFind(searchText, this.getOptionsContext());
- if (definitions.length === 0) {
- return false;
- }
-
- textSource.setEndOffset(length);
-
+ showContent(textSource, focus, definitions, type) {
const sentence = docSentenceExtract(textSource, this.options.anki.sentenceExt);
const url = window.location.href;
this.lastShowPromise = this.popup.showContent(
textSource.getRect(),
textSource.getWritingMode(),
- 'terms',
+ type,
{definitions, context: {sentence, url, focus}}
);
@@ -393,38 +385,32 @@ class Frontend {
if (this.options.scanning.selectText) {
textSource.select();
}
+ }
+
+ async findTerms(textSource) {
+ this.setTextSourceScanLength(textSource, this.options.scanning.length);
+
+ const searchText = textSource.text();
+ if (searchText.length === 0) { return null; }
+
+ const {definitions, length} = await apiTermsFind(searchText, this.getOptionsContext());
+ if (definitions.length === 0) { return null; }
+
+ textSource.setEndOffset(length);
- return true;
+ return {definitions, type: 'terms'};
}
- async searchKanji(textSource, focus) {
+ async findKanji(textSource) {
this.setTextSourceScanLength(textSource, 1);
const searchText = textSource.text();
- if (searchText.length === 0) {
- return false;
- }
+ if (searchText.length === 0) { return null; }
const definitions = await apiKanjiFind(searchText, this.getOptionsContext());
- if (definitions.length === 0) {
- return false;
- }
-
- const sentence = docSentenceExtract(textSource, this.options.anki.sentenceExt);
- const url = window.location.href;
- this.lastShowPromise = this.popup.showContent(
- textSource.getRect(),
- textSource.getWritingMode(),
- 'kanji',
- {definitions, context: {sentence, url, focus}}
- );
-
- this.textSourceLast = textSource;
- if (this.options.scanning.selectText) {
- textSource.select();
- }
+ if (definitions.length === 0) { return null; }
- return true;
+ return {definitions, type: 'kanji'};
}
searchClear(changeFocus) {