diff --git a/src/module/toggle.js b/src/module/toggle.js index be8244f..d6dbd10 100644 --- a/src/module/toggle.js +++ b/src/module/toggle.js @@ -1,57 +1,28 @@ function register_themeToggle() { const toggle = document.getElementById("theme-toggle"); - let storedMode = localStorage.getItem("theme-mode"); - - function getSystemScheme() { - return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'; - } - - function applyTheme(mode) { - const actualMode = mode === 'system' ? getSystemScheme() : mode; - const targetTheme = actualMode === "light" ? light_theme : dark_theme; - - document.documentElement.setAttribute("data-color-scheme", actualMode); - document.documentElement.setAttribute("theme-color-scheme", targetTheme); - } - - if (!storedMode) { - localStorage.setItem("theme-mode", default_mode); - storedMode = default_mode; - } - - applyTheme(storedMode); - - window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => { - if (localStorage.getItem("theme-mode") === "system") { - applyTheme("system"); - } - }); toggle.addEventListener("click", function () { - const nextMode = storedMode === "dark" ? "light" : "dark"; + let storedMode = localStorage.getItem("theme-mode"); + window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => { + if (localStorage.getItem("theme-mode") === "system") { + applyTheme("system"); + } + }); + const nextMode = storedMode === "dark" ? "light" : "dark"; applyTheme(nextMode); localStorage.setItem("theme-mode", nextMode); - storedMode = nextMode; }); } function register_pixelToggle() { const pixel_toggle = document.getElementById('pixel-toggle'); - let storedStatus = localStorage.getItem("pixel_style"); - if (!storedStatus) { - localStorage.setItem("pixel_style", pixel_status); - storedStatus = pixel_status.toString(); - } - - document.documentElement.setAttribute("pixel_style", storedStatus); pixel_toggle.addEventListener('click', function () { + let storedStatus = localStorage.getItem("pixel_style"); let newStatus = storedStatus === 'true' ? 'false' : 'true'; document.documentElement.setAttribute("pixel_style", newStatus); localStorage.setItem("pixel_style", newStatus); - - storedStatus = newStatus; }); } diff --git a/templates/modules/layout.html b/templates/modules/layout.html index 2ebae68..39a226e 100644 --- a/templates/modules/layout.html +++ b/templates/modules/layout.html @@ -13,7 +13,30 @@ const dark_theme = /*[[${theme.config.style.dark_color_schema}]]*/; const light_theme = /*[[${theme.config.style.light_color_schema}]]*/; const default_mode = /*[[${theme.config.style.default_schema_mode}]]*/; - const pixel_status = /*[[${theme.config.style.pixel_style}]]*/; + let storedMode = localStorage.getItem("theme-mode"); + function getSystemScheme() { + return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'; + } + function applyTheme(mode) { + const actualMode = mode === 'system' ? getSystemScheme() : mode; + const targetTheme = actualMode === "light" ? light_theme : dark_theme; + document.documentElement.setAttribute("data-color-scheme", actualMode); + document.documentElement.setAttribute("theme-color-scheme", targetTheme); + } + if (!storedMode) { + localStorage.setItem("theme-mode", default_mode); + storedMode = default_mode; + } + applyTheme(storedMode); + +