From 5502bf8aed8b9b4158cfe02ea5b042b03ef2f5cf Mon Sep 17 00:00:00 2001 From: Roderic Day Date: Fri, 13 Oct 2017 15:05:51 -0400 Subject: [PATCH] Place `nodeType` checks inside `caretRangeFromPoint` function Checked that it does not un-fix #80 Squelches alerts (but does not fix underlying issue) for #89 --- ext/fg/js/document.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/fg/js/document.js b/ext/fg/js/document.js index a1806d77..821a279f 100644 --- a/ext/fg/js/document.js +++ b/ext/fg/js/document.js @@ -76,7 +76,7 @@ function docRangeFromPoint(point) { if (!document.caretRangeFromPoint) { document.caretRangeFromPoint = (x, y) => { const position = document.caretPositionFromPoint(x,y); - if (position && position.offsetNode) { + if (position && position.offsetNode && position.offsetNode.nodeType === Node.TEXT_NODE) { const range = document.createRange(); range.setStart(position.offsetNode, position.offset); range.setEnd(position.offsetNode, position.offset); @@ -86,7 +86,7 @@ function docRangeFromPoint(point) { } const range = document.caretRangeFromPoint(point.x, point.y); - if (range && range.startContainer.nodeType === 3 && range.endContainer.nodeType === 3) { + if (range) { return new TextSourceRange(range); } }