From dd52a1c01af117d69c953241fc9380596e7bab20 Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Wed, 20 Feb 2019 21:47:31 -0500 Subject: [PATCH] Improve handling of null values from caretRangeFromPoint --- ext/fg/js/document.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/ext/fg/js/document.js b/ext/fg/js/document.js index 73e89d99..13acb036 100644 --- a/ext/fg/js/document.js +++ b/ext/fg/js/document.js @@ -85,20 +85,18 @@ function docRangeFromPoint(point) { range.setEnd(position.offsetNode, position.offset); return range; } + return null; }; } const range = document.caretRangeFromPoint(point.x, point.y); + if (range === null) { + return; + } if(imposter !== null) imposter.style.zIndex = -2147483646; - let rects; - try { - rects = range.getClientRects(); - } - catch (e) { - return; - } + const rects = range.getClientRects(); if (rects.length === 0) { return;