Merge pull request #2179 from shinyichen/darkmode-fix

Fixed dark mode setting logic error.
adsabs · Jun 11, 2021 · 8459c1a · 8459c1a
2 parents 55370f2 + ea84b0b
commit 8459c1a
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/src/js/dark-mode-switch.js b/src/js/dark-mode-switch.js
@@ -39,16 +39,17 @@ define(['analytics'], function(analytics) {
     darkSwitch = document.getElementById('darkSwitch');
 
     // 1. check app setting
-    if (
-      localStorage.getItem('darkSwitch') !== null &&
-      localStorage.getItem('darkSwitch') === 'on'
-    ) {
-      turnOnDarkMode(false);
-    }
-    // 2. check system setting
-    else if (window.matchMedia('(prefers-color-scheme: dark)').matches) {
+    if (localStorage.getItem('darkSwitch') !== null) {
+      if (localStorage.getItem('darkSwitch') === 'on') {
+        turnOnDarkMode(false);
+      } else {
+        turnOffDarkMode(false);
+      }
+    } else if (window.matchMedia('(prefers-color-scheme: dark)').matches) {
+      // 2. check system setting
       turnOnDarkMode(false);
     } else {
+      // 3. default to light
       turnOffDarkMode(false);
     }
     darkSwitch.addEventListener('click', function() {