From 3bfd56bbe46a4f2ee9c66f0c7baeec3c6292718c Mon Sep 17 00:00:00 2001
From: Kuuuube <61125188+Kuuuube@users.noreply.github.com>
Date: Tue, 28 May 2024 15:32:56 -0400
Subject: Fix clipboard monitor in popups (#1003)

* Fix naming of _clipboardReaderLike

* Allow clipboard monitors in popup searches

* Only run _onClipboardTextChange if a search tab does not exist
---
 ext/js/display/search-display-controller.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'ext/js/display')

diff --git a/ext/js/display/search-display-controller.js b/ext/js/display/search-display-controller.js
index 815c51c9..62dbf343 100644
--- a/ext/js/display/search-display-controller.js
+++ b/ext/js/display/search-display-controller.js
@@ -66,11 +66,11 @@ export class SearchDisplayController {
         /** @type {boolean} */
         this._clipboardMonitorEnabled = false;
         /** @type {import('clipboard-monitor').ClipboardReaderLike} */
-        this.clipboardReaderLike = {
+        this._clipboardReaderLike = {
             getText: this._display.application.api.clipboardGet.bind(this._display.application.api)
         };
         /** @type {ClipboardMonitor} */
-        this._clipboardMonitor = new ClipboardMonitor(this.clipboardReaderLike);
+        this._clipboardMonitor = new ClipboardMonitor(this._clipboardReaderLike);
         /** @type {import('application').ApiMap} */
         this._apiMap = createApiMap([
             ['searchDisplayControllerGetMode', this._onMessageGetMode.bind(this)],
@@ -271,7 +271,7 @@ export class SearchDisplayController {
     /** */
     async _onCopy() {
         // Ignore copy from search page
-        this._clipboardMonitor.setPreviousText(document.hasFocus() ? await this.clipboardReaderLike.getText(false) : '');
+        this._clipboardMonitor.setPreviousText(document.hasFocus() ? await this._clipboardReaderLike.getText(false) : '');
     }
 
     /** @type {import('application').ApiHandler<'searchDisplayControllerUpdateSearchQuery'>} */
@@ -498,7 +498,6 @@ export class SearchDisplayController {
      */
     _canEnableClipboardMonitor() {
         switch (this._searchPersistentStateController.mode) {
-            case 'popup':
             case 'action-popup':
                 return false;
             default:
-- 
cgit v1.2.3