From 889240311b4072021f3742345bc87118c5b3a3e1 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Thu, 31 Dec 2020 14:21:50 -0500
Subject: Improve tag scanning behaviour (#1189)

* Update include/exclude selectors for Display._definitionTextScanner

* Fix missing condition
---
 ext/mixed/js/text-scanner.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'ext/mixed/js/text-scanner.js')

diff --git a/ext/mixed/js/text-scanner.js b/ext/mixed/js/text-scanner.js
index f0903370..daea6a6c 100644
--- a/ext/mixed/js/text-scanner.js
+++ b/ext/mixed/js/text-scanner.js
@@ -198,8 +198,10 @@ class TextScanner extends EventDispatcher {
 
         clonedTextSource.setEndOffset(length, layoutAwareScan);
 
-        if (this._excludeSelector !== null) {
-            this._constrainTextSource(clonedTextSource, this._includeSelector, this._excludeSelector, layoutAwareScan);
+        const includeSelector = this._includeSelector;
+        const excludeSelector = this._excludeSelector;
+        if (includeSelector !== null || excludeSelector !== null) {
+            this._constrainTextSource(clonedTextSource, includeSelector, excludeSelector, layoutAwareScan);
         }
 
         return clonedTextSource.text();
-- 
cgit v1.2.3