alex/yomichan
1
Fork 0
Code Releases Activity

Merge pull request #201 from toasted-nutbread/omit-contains-point-check

Browse Source 
Omit containsPoint check on searchAt
This commit is contained in:
Alex Yatskov 2019-09-05 19:46:43 -07:00 committed by GitHub
commit 155986db46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/fg/js/frontend.js
View File

@ -302,7 +302,7 @@ class Frontend {
} }
const textSource = docRangeFromPoint(point, this.options); const textSource = docRangeFromPoint(point, this.options);
let hideResults = !textSource || !textSource.containsPoint(point); let hideResults = textSource === null;
let searched = false; let searched = false;
let success = false; let success = false;

22
ext/fg/js/source.js
View File

@ -59,11 +59,6 @@ class TextSourceRange {
return length - state.remainder; return length - state.remainder;
} }
containsPoint(point) {
const rect = this.getPaddedRect();
return point.x >= rect.left && point.x <= rect.right;
}
getRect() { getRect() {
return this.range.getBoundingClientRect(); return this.range.getBoundingClientRect();
} }
@ -72,18 +67,6 @@ class TextSourceRange {
return TextSourceRange.getElementWritingMode(TextSourceRange.getParentElement(this.range.startContainer)); return TextSourceRange.getElementWritingMode(TextSourceRange.getParentElement(this.range.startContainer));
} }
getPaddedRect() {
const range = this.range.cloneRange();
const startOffset = range.startOffset;
const endOffset = range.endOffset;
const node = range.startContainer;
range.setStart(node, Math.max(0, startOffset - 1));
range.setEnd(node, Math.min(node.length, endOffset + 1));
return range.getBoundingClientRect();
}
select() { select() {
const selection = window.getSelection(); const selection = window.getSelection();
selection.removeAllRanges(); selection.removeAllRanges();
@ -334,11 +317,6 @@ class TextSourceElement {
return 0; return 0;
} }
containsPoint(point) {
const rect = this.getRect();
return point.x >= rect.left && point.x <= rect.right;
}
getRect() { getRect() {
return this.element.getBoundingClientRect(); return this.element.getBoundingClientRect();
} }