diff options
| author | sijanec <sijanecantonluka@gmail.com> | 2020-05-20 17:12:13 +0200 |
|---|---|---|
| committer | sijanec <sijanecantonluka@gmail.com> | 2020-05-20 17:12:13 +0200 |
| commit | 3130a962bf7dba65acdd78d6ade2c88199094827 (patch) | |
| tree | 0d6ecb31eafea3e39d1f7835e0a4157f41550837 | |
| parent | changed load order (diff) | |
| download | beziapp-3130a962bf7dba65acdd78d6ade2c88199094827.tar beziapp-3130a962bf7dba65acdd78d6ade2c88199094827.tar.gz beziapp-3130a962bf7dba65acdd78d6ade2c88199094827.tar.bz2 beziapp-3130a962bf7dba65acdd78d6ade2c88199094827.tar.lz beziapp-3130a962bf7dba65acdd78d6ade2c88199094827.tar.xz beziapp-3130a962bf7dba65acdd78d6ade2c88199094827.tar.zst beziapp-3130a962bf7dba65acdd78d6ade2c88199094827.zip | |
Diffstat (limited to '')
| -rw-r--r-- | assets/js/settings.js | 10 | ||||
| -rwxr-xr-x | dist/js/app.js | 2 | ||||
| -rw-r--r-- | dist/js/settings.js | 10 | ||||
| -rwxr-xr-x | dist/pages/about.html | 2 | ||||
| -rwxr-xr-x | dist/sw.js | 4 |
5 files changed, 20 insertions, 8 deletions
diff --git a/assets/js/settings.js b/assets/js/settings.js index 5712039..b53d2ce 100644 --- a/assets/js/settings.js +++ b/assets/js/settings.js @@ -25,12 +25,18 @@ document.addEventListener("DOMContentLoaded", async () => { }); localforage.getItem("chosenLang").then((value) => { - let selectedLanguage = value ?? "sl"; + let selectedLanguage = value; + if(value == null || value.length < 1) { + selectedLanguage = "sl"; + } $(`#option-${selectedLanguage}`).attr("selected", true); }).catch(() => {}); localforage.getItem("theme").then((value) => { - let selectedTheme = value ?? "themeLight"; + let selectedTheme = value; + if(value == null || value.length < 1) { + selectedTheme = "themeLight"; + } $(`#option-${selectedTheme}`).attr("selected", true); }).catch(() => {}); diff --git a/dist/js/app.js b/dist/js/app.js index e935a0f..07197bb 100755 --- a/dist/js/app.js +++ b/dist/js/app.js @@ -3,7 +3,7 @@ const app_version = "1.0.13-beta"; -const previous_commit = "c721f2fd02613a5f8d5beb3b66a3681542da2048"; +const previous_commit = "f4aa5ca7f0ee77f5b26ff3f9d1b5c9f25cd1d2cb"; if ("serviceWorker" in navigator) { navigator.serviceWorker.register("/sw.js") diff --git a/dist/js/settings.js b/dist/js/settings.js index 5712039..b53d2ce 100644 --- a/dist/js/settings.js +++ b/dist/js/settings.js @@ -25,12 +25,18 @@ document.addEventListener("DOMContentLoaded", async () => { }); localforage.getItem("chosenLang").then((value) => { - let selectedLanguage = value ?? "sl"; + let selectedLanguage = value; + if(value == null || value.length < 1) { + selectedLanguage = "sl"; + } $(`#option-${selectedLanguage}`).attr("selected", true); }).catch(() => {}); localforage.getItem("theme").then((value) => { - let selectedTheme = value ?? "themeLight"; + let selectedTheme = value; + if(value == null || value.length < 1) { + selectedTheme = "themeLight"; + } $(`#option-${selectedTheme}`).attr("selected", true); }).catch(() => {}); diff --git a/dist/pages/about.html b/dist/pages/about.html index 1d75f8b..7d8992d 100755 --- a/dist/pages/about.html +++ b/dist/pages/about.html @@ -142,7 +142,7 @@ <div class="row"> <p> <small> - ^HEAD c721f2fd02613a5f8d5beb3b66a3681542da2048 + ^HEAD f4aa5ca7f0ee77f5b26ff3f9d1b5c9f25cd1d2cb </small> </p> </div> @@ -3,8 +3,8 @@ // Change version to cause cache refresh -const static_cache_name = "site-static-1.0.13-beta-c721f2f"; -// latest commit is c721f2fd02613a5f8d5beb3b66a3681542da2048 +const static_cache_name = "site-static-1.0.13-beta-f4aa5ca"; +// latest commit is f4aa5ca7f0ee77f5b26ff3f9d1b5c9f25cd1d2cb // Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js // sw.js NE SME BITI CACHAN, ker vsebuje verzijo! |