diff options
author | Alex Yatskov <FooSoft@users.noreply.github.com> | 2019-09-05 19:46:43 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-05 19:46:43 -0700 |
commit | 155986db4626f1eaacc7ce8455ae6aa6348f0653 (patch) | |
tree | 82587d185ebedb04badcad9772e1ada78a010a2b | |
parent | 6dc44e3f33d6f2ac2b5b7442879631a2943fcadc (diff) | |
parent | 5c793180d04e6b5eafaf01c823f5f5e07639cfa9 (diff) |
Merge pull request #201 from toasted-nutbread/omit-contains-point-check
Omit containsPoint check on searchAt
-rw-r--r-- | ext/fg/js/frontend.js | 2 | ||||
-rw-r--r-- | ext/fg/js/source.js | 22 |
2 files changed, 1 insertions, 23 deletions
diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js index b70bf036..079a7ef2 100644 --- a/ext/fg/js/frontend.js +++ b/ext/fg/js/frontend.js @@ -302,7 +302,7 @@ class Frontend { } const textSource = docRangeFromPoint(point, this.options); - let hideResults = !textSource || !textSource.containsPoint(point); + let hideResults = textSource === null; let searched = false; let success = false; diff --git a/ext/fg/js/source.js b/ext/fg/js/source.js index 385b5001..18a1a976 100644 --- a/ext/fg/js/source.js +++ b/ext/fg/js/source.js @@ -59,11 +59,6 @@ class TextSourceRange { return length - state.remainder; } - containsPoint(point) { - const rect = this.getPaddedRect(); - return point.x >= rect.left && point.x <= rect.right; - } - getRect() { return this.range.getBoundingClientRect(); } @@ -72,18 +67,6 @@ class TextSourceRange { 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() { const selection = window.getSelection(); selection.removeAllRanges(); @@ -334,11 +317,6 @@ class TextSourceElement { return 0; } - containsPoint(point) { - const rect = this.getRect(); - return point.x >= rect.left && point.x <= rect.right; - } - getRect() { return this.element.getBoundingClientRect(); } |