diff options
| author | rstular <rok@stular.eu> | 2020-05-17 19:38:43 +0200 |
|---|---|---|
| committer | rstular <rok@stular.eu> | 2020-05-17 19:38:43 +0200 |
| commit | 61f0a67abdd293a17232bd5784b08709a3cd7856 (patch) | |
| tree | f490a063655a85bc42eef58abf6d99581183174a /assets | |
| parent | Merge (diff) | |
| download | beziapp-61f0a67abdd293a17232bd5784b08709a3cd7856.tar beziapp-61f0a67abdd293a17232bd5784b08709a3cd7856.tar.gz beziapp-61f0a67abdd293a17232bd5784b08709a3cd7856.tar.bz2 beziapp-61f0a67abdd293a17232bd5784b08709a3cd7856.tar.lz beziapp-61f0a67abdd293a17232bd5784b08709a3cd7856.tar.xz beziapp-61f0a67abdd293a17232bd5784b08709a3cd7856.tar.zst beziapp-61f0a67abdd293a17232bd5784b08709a3cd7856.zip | |
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/js/gsec.js | 2 | ||||
| -rw-r--r-- | assets/js/settings.js | 8 | ||||
| -rw-r--r-- | assets/pages-src/settings.bvr | 8 |
3 files changed, 8 insertions, 10 deletions
diff --git a/assets/js/gsec.js b/assets/js/gsec.js index c961c23..1016e7c 100644 --- a/assets/js/gsec.js +++ b/assets/js/gsec.js @@ -250,7 +250,7 @@ class gsec { fetchGradings() { const DESC_REGEX = /\((.+?)\)/; - const SUBJECT_REGEX = /^(.+?) \(/; + const SUBJECT_REGEX = /^(.+?) \(/m; return new Promise((resolve) => { var gradings = []; diff --git a/assets/js/settings.js b/assets/js/settings.js index f31bfaf..3cb4c9b 100644 --- a/assets/js/settings.js +++ b/assets/js/settings.js @@ -17,13 +17,11 @@ async function setTheme(targetTheme) { document.addEventListener("DOMContentLoaded", async () => { $("#select-language").on("change", () => { - let languageToSet = $(this).find(":selected").data("language"); - setLanguage(languageToSet); + setLanguage($(this).find(":selected").val()); }); - $("#select-theme").on("change", () => { - let themeToSet = $(this).find(":selected").data("theme"); - setTheme(themeToSet); + $("#select-theme").on("change", function() { + setTheme($(this).find(":selected").val()); }); localforage.getItem("chosenLang").then((value) => { diff --git a/assets/pages-src/settings.bvr b/assets/pages-src/settings.bvr index 2056184..358a0ce 100644 --- a/assets/pages-src/settings.bvr +++ b/assets/pages-src/settings.bvr @@ -59,8 +59,8 @@ <div class="input-field col s12"> <i class="material-icons prefix">translate</i> <select class="lang-select icons" id="select-language"> - <option value="" id="option-sl" data-language="sl" data-icon="/img/flags/sl.svg" selected>Slovenščina</option> - <option value="" id="option-en" data-language="en" data-icon="/img/flags/en.svg">English</option> + <option value="sl" id="option-sl" data-icon="/img/flags/sl.svg" selected>Slovenščina</option> + <option value="en" id="option-en" data-icon="/img/flags/en.svg">English</option> </select> <label><x-su>selectLanguage</x-su></label> </div> @@ -71,8 +71,8 @@ <div class="input-field col s12"> <i class="material-icons prefix">palette</i> <select class="theme-select" id="select-theme"> - <option value="" id="option-light" data-theme="light" selected><x-su>themeLight</x-su></option> - <option value="" id="option-dark" data-theme="dark"><x-su>themeDark</x-su></option> + <option value="light" id="option-light" data-theme="light" selected>Light</option> + <option value="dark" id="option-dark" data-theme="dark">Dark</option> </select> <label><x-su>selectTheme</x-su></label> </div> |