diff options
author | Kyle Gunger <kgunger12@gmail.com> | 2021-10-16 18:40:51 -0400 |
---|---|---|
committer | Kyle Gunger <kgunger12@gmail.com> | 2021-10-16 18:40:51 -0400 |
commit | 606de4038bfa3be22a9c24cf5010f03572b87598 (patch) | |
tree | 67ec4b8ad4ee222eacee9de685929294bb131747 | |
parent | b8c91f08adc7bdb0095fb61a59bc03f0d568f478 (diff) |
[HOTFIX] Pre-select user's last theme
-rw-r--r-- | index.html | 31 | ||||
-rw-r--r-- | scripts/theme.js | 4 |
2 files changed, 27 insertions, 8 deletions
@@ -58,8 +58,8 @@ <script> - var prev = Cookies.getCookie("prevAddr"); - var prevEl = document.getElementById("prev"); + let prev = Cookies.getCookie("prevAddr"); + let prevEl = document.getElementById("prev"); function hasAddr(url) { let urls = prev.split(","); @@ -151,15 +151,15 @@ Theme.set(e.target.getValue()); } - var optionsEL = document.getElementById("options"); - var options = new Settings(Options); + let optionsEL = document.getElementById("options"); + let options = new Settings(Options); options.putSettings(optionsEL); - var themeEL = document.getElementById("themes"); - var themeOpt = new Settings(ThemeOptions); + let themeEL = document.getElementById("themes"); + let themeOpt = new Settings(ThemeOptions); themeOpt.putSettings(themeEL); - var themeSelector = MakeInput.selectInput(...BASE_THEMES); + let themeSelector = MakeInput.selectInput(...BASE_THEMES); themeEL.appendChild(MakeInput.titleWrap(themeSelector, "Select Theme")); themeSelector.addEventListener("change", changeTheme); @@ -175,7 +175,7 @@ } function remTheme() { - var idx = themeSelector.getIndex(); + let idx = themeSelector.getIndex(); if (idx < BASE_THEMES[0].length) return; @@ -192,6 +192,21 @@ //c.setAttribute("href", url); window.location = "client.html?s=" + concat + "&g=-1"; } + + let themeURL = Theme.get(); + for(let i = 0; i < BASE_THEMES[0].length; i++) { + if(themeURL === BASE_THEMES[0][i]){ + themeSelector.setIndex(i); + break; + } + } + + for(let i = 0; i < Theme.UserThemes[1].length; i++) { + if(themeURL === Theme.UserThemes[1][i]){ + themeSelector.setIndex(i + BASE_THEMES[0].length); + break; + } + } </script> </body> diff --git a/scripts/theme.js b/scripts/theme.js index 886a3a1..78f0149 100644 --- a/scripts/theme.js +++ b/scripts/theme.js @@ -40,6 +40,10 @@ class Theme{ Theme.theme.setAttribute("href", sheet + "?v=" + Date.now()); } + static get() { + return Cookies.getCookie("theme"); + } + static setUserThemes() { let out = ""; for (let i = 0; i < this.UserThemes[0].length; i++) |