Merge branch 'master' into testing

1 files changed, 14 insertions, 8 deletions

diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index a2707bd0..ebf56897 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -80,20 +80,26 @@ class Display {
             const {docRangeFromPoint, docSentenceExtract} = this.dependencies;
 
             const clickedElement = $(e.target);
-            const textSource = docRangeFromPoint({x: e.clientX, y: e.clientY});
+            const textSource = docRangeFromPoint({x: e.clientX, y: e.clientY}, this.options);
             if (textSource === null) {
                 return false;
             }
-            textSource.setEndOffset(this.options.scanning.length);
 
-            const {definitions, length} = await apiTermsFind(textSource.text());
-            if (definitions.length === 0) {
-                return false;
-            }
+            let definitions, length, sentence;
+            try {
+                textSource.setEndOffset(this.options.scanning.length);
 
-            textSource.setEndOffset(length);
+                ({definitions, length} = await apiTermsFind(textSource.text()));
+                if (definitions.length === 0) {
+                    return false;
+                }
 
-            const sentence = docSentenceExtract(textSource, this.options.anki.sentenceExt);
+                textSource.setEndOffset(length);
+
+                sentence = docSentenceExtract(textSource, this.options.anki.sentenceExt);
+            } finally {
+                textSource.cleanup();
+            }
 
             const context = {
                 source: {