diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js index 25dd38e1..3c5f2ac8 100644 --- a/ext/fg/js/frontend.js +++ b/ext/fg/js/frontend.js @@ -172,7 +172,12 @@ class Frontend { return; } - this.setPrimaryTouch(this.getPrimaryTouch(e.changedTouches)); + let touch = this.getPrimaryTouch(e.changedTouches); + if (this.selectionContainsPoint(window.getSelection(), touch.clientX, touch.clientY)) { + touch = null; + } + + this.setPrimaryTouch(touch); } onTouchEnd(e) { @@ -289,7 +294,8 @@ class Frontend { if (!hideResults && (!this.textSourceLast || !this.textSourceLast.equals(textSource))) { searched = true; this.pendingLookup = true; - hideResults = !await this.searchTerms(textSource) && !await this.searchKanji(textSource); + const focus = (type === 'mouse'); + hideResults = !await this.searchTerms(textSource, focus) && !await this.searchKanji(textSource, focus); success = true; } } catch (e) { @@ -312,7 +318,7 @@ class Frontend { } } - async searchTerms(textSource) { + async searchTerms(textSource, focus) { textSource.setEndOffset(this.options.scanning.length); const {definitions, length} = await apiTermsFind(textSource.text()); @@ -328,7 +334,7 @@ class Frontend { textSource.getRect(), definitions, this.options, - {sentence, url} + {sentence, url, focus} ); this.textSourceLast = textSource; @@ -339,7 +345,7 @@ class Frontend { return true; } - async searchKanji(textSource) { + async searchKanji(textSource, focus) { textSource.setEndOffset(1); const definitions = await apiKanjiFind(textSource.text()); @@ -353,7 +359,7 @@ class Frontend { textSource.getRect(), definitions, this.options, - {sentence, url} + {sentence, url, focus} ); this.textSourceLast = textSource; @@ -456,6 +462,18 @@ class Frontend { search(); } + + selectionContainsPoint(selection, x, y) { + for (let i = 0; i < selection.rangeCount; ++i) { + const range = selection.getRangeAt(i); + for (const rect of range.getClientRects()) { + if (x >= rect.left && x <= rect.right && y >= rect.top && y <= rect.bottom) { + return true; + } + } + } + return false; + } } window.yomichan_frontend = new Frontend(); diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js index 01cb406e..a2707bd0 100644 --- a/ext/mixed/js/display.js +++ b/ext/mixed/js/display.js @@ -272,7 +272,9 @@ class Display { async termsShow(definitions, options, context) { try { - window.focus(); + if (!context || context.focus !== false) { + window.focus(); + } this.definitions = definitions; this.options = options; @@ -324,7 +326,9 @@ class Display { async kanjiShow(definitions, options, context) { try { - window.focus(); + if (!context || context.focus !== false) { + window.focus(); + } this.definitions = definitions; this.options = options;