From 5c7cf884235fd1a65e83091793e525451e317d8c Mon Sep 17 00:00:00 2001 From: rstular Date: Sun, 17 May 2020 14:07:41 +0200 Subject: Bug fix - GSEC regex matching --- assets/js/gsec.js | 2 +- dist/js/gsec.js | 2 +- dist/pages/about.html | 2 +- dist/sw.js | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/js/gsec.js b/assets/js/gsec.js index 6bd8f52..6c3de0f 100644 --- a/assets/js/gsec.js +++ b/assets/js/gsec.js @@ -290,7 +290,7 @@ class gsec { fetchTeachers() { // razrednika ne vrne kot razrednika, če le-ta uči še en predmet. razlog: razrednik je napisan dvakrat, drugič se prepiše. Ne da se mi popravljat. - const SUBJECT_REGEX = /^(.+?) \(/; + const SUBJECT_REGEX = /^(.+?(?= \()|.+(?! \())/; // For some reason, JS doesn't support conditional regex const ABKURZUNG_REGEX = /\((.+?)\)/; const DAY_REGEX = /^(.+?), /; const PERIOD_REGEX = /, (\d+?)\. ura/; diff --git a/dist/js/gsec.js b/dist/js/gsec.js index 6bd8f52..6c3de0f 100644 --- a/dist/js/gsec.js +++ b/dist/js/gsec.js @@ -290,7 +290,7 @@ class gsec { fetchTeachers() { // razrednika ne vrne kot razrednika, če le-ta uči še en predmet. razlog: razrednik je napisan dvakrat, drugič se prepiše. Ne da se mi popravljat. - const SUBJECT_REGEX = /^(.+?) \(/; + const SUBJECT_REGEX = /^(.+?(?= \()|.+(?! \())/; // For some reason, JS doesn't support conditional regex const ABKURZUNG_REGEX = /\((.+?)\)/; const DAY_REGEX = /^(.+?), /; const PERIOD_REGEX = /, (\d+?)\. ura/; diff --git a/dist/pages/about.html b/dist/pages/about.html index 16b0540..be31e44 100644 --- a/dist/pages/about.html +++ b/dist/pages/about.html @@ -142,7 +142,7 @@

- ^HEAD c2d13f23711f90b86cff6ca06552b69dd2228932 + ^HEAD 96dd81ddf1188377bf1402e866c4b263dbd55d1c

diff --git a/dist/sw.js b/dist/sw.js index 57d1646..c2a150b 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-c2d13f2"; -// latest commit is c2d13f23711f90b86cff6ca06552b69dd2228932 +const static_cache_name = "site-static-1.0.13-beta-96dd81d"; +// latest commit is 96dd81ddf1188377bf1402e866c4b263dbd55d1c // Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js // sw.js NE SME BITI CACHAN, ker vsebuje verzijo! -- cgit v1.2.3