diff options
| -rw-r--r-- | assets/js/app.js | 7 | ||||
| -rw-r--r-- | dist/js/app.js | 7 | ||||
| -rw-r--r-- | dist/js/gsec.js | 2 | ||||
| -rw-r--r-- | dist/pages/about.html | 4 | ||||
| -rw-r--r-- | dist/sw.js | 5 |
5 files changed, 24 insertions, 1 deletions
diff --git a/assets/js/app.js b/assets/js/app.js index 79ccf06..b2623b9 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -47,3 +47,10 @@ function gsecErrorHandlerUI(err) { UIAlert( D("gsecErrOther") ); } } + + +window.onerror = function (msg, url, lineNo, columnNo, error) { + // ... handle error ... + console.log("error!"); + return false; +} diff --git a/dist/js/app.js b/dist/js/app.js index 79ccf06..d47437e 100644 --- a/dist/js/app.js +++ b/dist/js/app.js @@ -47,3 +47,10 @@ function gsecErrorHandlerUI(err) { UIAlert( D("gsecErrOther") ); } } + + +window.onerror = function (msg, url, lineNo, columnNo, error) { + // ... handle error ... + alert("f u k"); + return false; +} diff --git a/dist/js/gsec.js b/dist/js/gsec.js index 404bc0c..a3a8bdd 100644 --- a/dist/js/gsec.js +++ b/dist/js/gsec.js @@ -292,7 +292,7 @@ class gsec { const SUBJECT_REGEX = /^(.+?(?= \()|.+(?! \())/; // For some reason, JS doesn't support conditional regex const ABKURZUNG_REGEX = /\((.+)\)/; - const DAY_REGEX = /^(.+?), /; + const DAY_REGEX = /^(.+?), /m; const PERIOD_REGEX = /, (\d+?)\. ura/; const TIME_RANGE_REGEX = /\((.+?) - (.+?)\)/; diff --git a/dist/pages/about.html b/dist/pages/about.html index 15ed04c..8dd6f27 100644 --- a/dist/pages/about.html +++ b/dist/pages/about.html @@ -142,7 +142,11 @@ <div class="row"> <p> <small> +<<<<<<< HEAD + ^HEAD bed93d7d52a80a05cd87c5eeacdcafde8cafe24a +======= ^HEAD b0d7eb0101a6c8a26c97a1c7069e4496706225ec +>>>>>>> 837a4ad3f49cb4441d294e67332b98818fc90011 </small> </p> </div> @@ -3,8 +3,13 @@ // Change version to cause cache refresh +<<<<<<< HEAD +const static_cache_name = "site-static-1.0.13-beta-bed93d7"; +// latest commit is bed93d7d52a80a05cd87c5eeacdcafde8cafe24a +======= const static_cache_name = "site-static-1.0.13-beta-b0d7eb0"; // latest commit is b0d7eb0101a6c8a26c97a1c7069e4496706225ec +>>>>>>> 837a4ad3f49cb4441d294e67332b98818fc90011 // Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js // sw.js NE SME BITI CACHAN, ker vsebuje verzijo! |