Merge branch 'master' into unix-sockets

1 files changed, 36 insertions, 74 deletions

diff --git a/assets/js/themes.js b/assets/js/themes.js
index 543b849e..84a9f6d9 100644
--- a/assets/js/themes.js
+++ b/assets/js/themes.js
@@ -1,84 +1,46 @@
+'use strict';
 var toggle_theme = document.getElementById('toggle_theme');
-toggle_theme.href = 'javascript:void(0);';
+toggle_theme.href = 'javascript:void(0)';
 
-toggle_theme.addEventListener('click', function () {
-    var dark_mode = document.body.classList.contains("light-theme");
-
-    var url = '/toggle_theme?redirect=false';
-    var xhr = new XMLHttpRequest();
-    xhr.responseType = 'json';
-    xhr.timeout = 10000;
-    xhr.open('GET', url, true);
-
-    set_mode(dark_mode);
-    window.localStorage.setItem('dark_mode', dark_mode ? 'dark' : 'light');
+const STORAGE_KEY_THEME = 'dark_mode';
+const THEME_DARK = 'dark';
+const THEME_LIGHT = 'light';
 
-    xhr.send();
-});
-
-window.addEventListener('storage', function (e) {
-    if (e.key === 'dark_mode') {
-        update_mode(e.newValue);
-    }
-});
-
-window.addEventListener('DOMContentLoaded', function () {
-    window.localStorage.setItem('dark_mode', document.getElementById('dark_mode_pref').textContent);
-    // Update localStorage if dark mode preference changed on preferences page
-    update_mode(window.localStorage.dark_mode);
+// TODO: theme state controlled by system
+toggle_theme.addEventListener('click', function () {
+    const isDarkTheme = helpers.storage.get(STORAGE_KEY_THEME) === THEME_DARK;
+    const newTheme = isDarkTheme ? THEME_LIGHT : THEME_DARK;
+    setTheme(newTheme);
+    helpers.storage.set(STORAGE_KEY_THEME, newTheme);
+    helpers.xhr('GET', '/toggle_theme?redirect=false', {}, {});
 });
 
-
-var darkScheme = window.matchMedia('(prefers-color-scheme: dark)');
-var lightScheme = window.matchMedia('(prefers-color-scheme: light)');
-
-darkScheme.addListener(scheme_switch);
-lightScheme.addListener(scheme_switch);
-
-function scheme_switch (e) {
-  // ignore this method if we have a preference set
-  if (localStorage.getItem('dark_mode')) {
-    return;
-  }
-  if (e.matches) {
-    if (e.media.includes("dark")) {
-      set_mode(true);
-    } else if (e.media.includes("light")) {
-      set_mode(false);
-    }
-  }
-}
-
-function set_mode (bool) {
-    if (bool) {
-        // dark
-        toggle_theme.children[0].setAttribute('class', 'icon ion-ios-sunny');
-        document.body.classList.remove('no-theme');
-        document.body.classList.remove('light-theme');
-        document.body.classList.add('dark-theme');
+/** @param {THEME_DARK|THEME_LIGHT} theme */
+function setTheme(theme) {
+    // By default body element has .no-theme class that uses OS theme via CSS @media rules
+    // It rewrites using hard className below
+    if (theme === THEME_DARK) {
+        toggle_theme.children[0].className = 'icon ion-ios-sunny';
+        document.body.className = 'dark-theme';
+    } else if (theme === THEME_LIGHT) {
+        toggle_theme.children[0].className = 'icon ion-ios-moon';
+        document.body.className = 'light-theme';
     } else {
-        // light
-        toggle_theme.children[0].setAttribute('class', 'icon ion-ios-moon');
-        document.body.classList.remove('no-theme');
-        document.body.classList.remove('dark-theme');
-        document.body.classList.add('light-theme');
+        document.body.className = 'no-theme';
     }
 }
 
-function update_mode (mode) {
-    if (mode === 'true' /* for backwards compatibility */ || mode === 'dark') {
-        // If preference for dark mode indicated
-        set_mode(true);
-    }
-	else if (mode === 'false' /* for backwards compaibility */ || mode === 'light') {
-		// If preference for light mode indicated
-		set_mode(false);
-	}
-    else if (document.getElementById('dark_mode_pref').textContent === '' && window.matchMedia('(prefers-color-scheme: dark)').matches) {
-        // If no preference indicated here and no preference indicated on the preferences page (backend), but the browser tells us that the operating system has a dark theme
-        set_mode(true);
-    }
-    // else do nothing, falling back to the mode defined by the `dark_mode` preference on the preferences page (backend)
-}
-
+// Handles theme change event caused by other tab
+addEventListener('storage', function (e) {
+    if (e.key === STORAGE_KEY_THEME)
+        setTheme(helpers.storage.get(STORAGE_KEY_THEME));
+});
 
+// Set theme from preferences on page load
+addEventListener('DOMContentLoaded', function () {
+    const prefTheme = document.getElementById('dark_mode_pref').textContent;
+    if (prefTheme) {
+        setTheme(prefTheme);
+        helpers.storage.set(STORAGE_KEY_THEME, prefTheme);
+    }
+});