Skip to content

Commit 86d45c0

Browse files
authored
Fix disabled scanning on search page not disabling for touch (#2027)
1 parent c012641 commit 86d45c0

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

ext/js/display/display.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2027,7 +2027,7 @@ export class Display extends EventDispatcher {
20272027
* @param {import('settings').ProfileOptions} options
20282028
*/
20292029
_updateContentTextScanner(options) {
2030-
if (!options.scanning.enablePopupSearch) {
2030+
if ((!options.scanning.enablePopupSearch && this._pageType === 'popup') || (!options.scanning.enableOnSearchPage && this._pageType === 'search')) {
20312031
if (this._contentTextScanner !== null) {
20322032
this._contentTextScanner.setEnabled(false);
20332033
this._contentTextScanner.clearSelection();

ext/js/display/query-parser.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ export class QueryParser extends EventDispatcher {
119119
this._textScanner.language = language;
120120
this._textScanner.setOptions(scanning);
121121
}
122-
this._textScanner.setEnabled(true);
122+
123123
if (selectedParserChanged && this._parseResults.length > 0) {
124124
this._renderParseResult();
125125
}

ext/js/language/text-scanner.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1098,7 +1098,7 @@ export class TextScanner extends EventDispatcher {
10981098

10991099
eventListenerInfos.push(this._getSelectionChangeCheckUserSelectionListener());
11001100

1101-
for (const [...args] of eventListenerInfos) {
1101+
for (const args of eventListenerInfos) {
11021102
this._eventListeners.addEventListener(...args);
11031103
}
11041104
}

0 commit comments

Comments
 (0)