Add toggle to disable universal dark mode

2 files changed, 12 insertions, 2 deletions

diff --git a/src/webview/recipe.js b/src/webview/recipe.js
index 6068e6c4a..d18d16082 100644
--- a/src/webview/recipe.js
+++ b/src/webview/recipe.js
@@ -43,6 +43,8 @@ class RecipeController {
     'get-service-id': 'serviceIdEcho',
   };
 
+  universalDarkModeInjected = false;
+
   constructor() {
     this.initialize();
   }
@@ -127,11 +129,12 @@ class RecipeController {
 
       if (darkModeExists) {
         injectDarkModeStyle(this.settings.service.recipe.path);
-      } else if (!ignoreList.includes(window.location.host)) {
+      } else if (this.settings.app.universalDarkMode && !ignoreList.includes(window.location.host)) {
         // Use darkreader instead
         enableDarkMode({}, {
           css: customDarkModeCss[window.location.host] || '',
         });
+        this.universalDarkModeInjected = true;
       }
     } else {
       debug('Remove dark mode');
@@ -140,8 +143,15 @@ class RecipeController {
         removeDarkModeStyle();
       } else {
         disableDarkMode();
+        this.universalDarkModeInjected = false;
       }
     }
+
+    // Remove dark reader if (universal) dark mode was just disabled
+    if (this.universalDarkModeInjected && (!this.settings.app.darkMode || !this.settings.app.universalDarkMode)) {
+      disableDarkMode();
+      this.universalDarkModeInjected = false;
+    }
   }
 
   updateAppSettings(event, data) {
diff --git a/src/webview/spellchecker.js b/src/webview/spellchecker.js
index 27380676d..1cb449110 100644
--- a/src/webview/spellchecker.js
+++ b/src/webview/spellchecker.js
@@ -96,7 +96,7 @@ export function isEnabled() {
 
 export function disable() {
   if (isEnabled()) {
-    webFrame.setSpellCheckProvider(currentDict, true, { spellCheck: () => true });
+    webFrame.setSpellCheckProvider(currentDict, { spellCheck: () => true });
     _isEnabled = false;
     currentDict = null;
   }