summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--assets/js/gsec.js2
-rw-r--r--assets/js/settings.js8
-rw-r--r--assets/pages-src/settings.bvr8
-rw-r--r--dist/js/gsec.js2
-rw-r--r--dist/js/settings.js8
-rw-r--r--dist/pages/about.html2
-rw-r--r--dist/pages/settings.html8
-rw-r--r--dist/sw.js4
8 files changed, 19 insertions, 23 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>
diff --git a/dist/js/gsec.js b/dist/js/gsec.js
index c961c23..1016e7c 100644
--- a/dist/js/gsec.js
+++ b/dist/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/dist/js/settings.js b/dist/js/settings.js
index f31bfaf..3cb4c9b 100644
--- a/dist/js/settings.js
+++ b/dist/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/dist/pages/about.html b/dist/pages/about.html
index 6f5fa03..4600c20 100644
--- a/dist/pages/about.html
+++ b/dist/pages/about.html
@@ -143,7 +143,7 @@
<div class="row">
<p>
<small>
- ^HEAD dbb621cf007277597a39d0dec72193f81cc0d0a7
+ ^HEAD de95a6b78788da7472850dad13ed9b7de9e5b9b1
</p>
</div>
</div>
diff --git a/dist/pages/settings.html b/dist/pages/settings.html
index 38d442a..ae93daf 100644
--- a/dist/pages/settings.html
+++ b/dist/pages/settings.html
@@ -80,8 +80,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>
@@ -92,8 +92,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>
diff --git a/dist/sw.js b/dist/sw.js
index 385c54e..0ad0bf4 100644
--- a/dist/sw.js
+++ b/dist/sw.js
@@ -3,8 +3,8 @@
// Change version to cause cache refresh
-const static_cache_name = "site-static-1.0.13-beta-dbb621c";
-// latest commit is dbb621cf007277597a39d0dec72193f81cc0d0a7
+const static_cache_name = "site-static-1.0.13-beta-de95a6b";
+// latest commit is de95a6b78788da7472850dad13ed9b7de9e5b9b1
// Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js
// sw.js NE SME BITI CACHAN, ker vsebuje verzijo!
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 05:11:31 +0100