From 34fed22ccb34720a16097baebc25fe96278be93c Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Mon, 25 Jan 2021 22:18:31 -0500
Subject: Fix clipboard monitor not persisting (#1315)

* Add optionsUpdated event to Display

* Update this._clipboardMonitorEnabled

* Update settings to ensure no unexpected behaviour
---
 ext/bg/js/options.js | 2 ++
 ext/bg/js/search.js  | 7 +++++++
 2 files changed, 9 insertions(+)

(limited to 'ext/bg')

diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index 1417c975..14b858aa 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -670,6 +670,7 @@ class OptionsUtil {
         //  Updated global.useSettingsV2 to be true (opt-out).
         //  Added audio.customSourceType.
         //  Added general.autoSearchClipboardContent.
+        //  Forced general.enableClipboardMonitor to false due to a bug which caused its value to not be read.
         await this._addFieldTemplatesToOptions(options, '/bg/data/anki-field-templates-upgrade-v8.handlebars');
         options.global.useSettingsV2 = true;
         for (const profile of options.profiles) {
@@ -730,6 +731,7 @@ class OptionsUtil {
             };
             profile.options.audio.customSourceType = 'audio';
             profile.options.general.autoSearchClipboardContent = true;
+            profile.options.general.enableClipboardMonitor = false;
         }
         return options;
     }
diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js
index 0fcbcd13..3b7e8299 100644
--- a/ext/bg/js/search.js
+++ b/ext/bg/js/search.js
@@ -54,6 +54,7 @@ class DisplaySearch extends Display {
         await this.updateOptions();
         yomichan.on('optionsUpdated', this._onOptionsUpdated.bind(this));
 
+        this.on('optionsUpdated', this._onDisplayOptionsUpdated.bind(this));
         this.on('contentUpdating', this._onContentUpdating.bind(this));
         this.on('modeChange', this._onModeChange.bind(this));
 
@@ -76,6 +77,7 @@ class DisplaySearch extends Display {
         this.hotkeyHandler.on('keydownNonHotkey', this._onKeyDown.bind(this));
 
         this._onModeChange();
+        this._onDisplayOptionsUpdated();
 
         this.initializeState();
 
@@ -123,6 +125,11 @@ class DisplaySearch extends Display {
         }
     }
 
+    _onDisplayOptionsUpdated({options}) {
+        this._clipboardMonitorEnabled = options.general.enableClipboardMonitor;
+        this._updateClipboardMonitorEnabled();
+    }
+
     _onContentUpdating({type, content, source}) {
         let animate = false;
         let valid = false;
-- 
cgit v1.2.3