alex/yomichan
1
Fork 0
Code Releases Activity

fix search for input controls

Browse Source
This commit is contained in:
Alex Yatskov 2017-05-22 22:27:09 -07:00
parent fd346ae44b
commit 48693fa594
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ext/fg/js/driver.js
View File

@ -144,6 +144,7 @@ window.driver = new class {
const textSource = docRangeFromPoint(point, this.options.scanning.imposter); const textSource = docRangeFromPoint(point, this.options.scanning.imposter);
if (!textSource || !textSource.containsPoint(point)) { if (!textSource || !textSource.containsPoint(point)) {
docImposterDestroy();
return; return;
} }
@ -168,6 +169,7 @@ window.driver = new class {
return bgTermsFind(textSource.text()).then(({definitions, length}) => { return bgTermsFind(textSource.text()).then(({definitions, length}) => {
if (definitions.length === 0) { if (definitions.length === 0) {
docImposterDestroy();
return false; return false;
} else { } else {
textSource.setEndOffset(length); textSource.setEndOffset(length);
@ -186,6 +188,7 @@ window.driver = new class {
textSource.select(); textSource.select();
} }
docImposterDestroy();
return true; return true;
} }
}); });

8
ext/fg/js/util.js
View File

@ -112,12 +112,6 @@ function docImposterDestroy() {
} }
} }
function docImposterHide() {
for (const element of document.getElementsByClassName('yomichan-imposter')) {
element.style.visibility = 'hidden';
}
}
function docRangeFromPoint(point, imposter) { function docRangeFromPoint(point, imposter) {
const element = document.elementFromPoint(point.x, point.y); const element = document.elementFromPoint(point.x, point.y);
if (element !== null) { if (element !== null) {
@ -144,11 +138,9 @@ function docRangeFromPoint(point, imposter) {
const range = document.caretRangeFromPoint(point.x, point.y); const range = document.caretRangeFromPoint(point.x, point.y);
if (range !== null) { if (range !== null) {
docImposterHide();
return new TextSourceRange(range); return new TextSourceRange(range);
} }
docImposterDestroy();
return null; return null;
} }