From a6b27a276c6da60d7fa21c5d767ef7d38c9fac2a Mon Sep 17 00:00:00 2001 From: rstular Date: Sun, 17 May 2020 14:21:27 +0200 Subject: GSEC bug fix - fetch teachers Subject with parenthesis in their name got improperly matched because of a lazy flag. Now it's removed, it works properly. --- 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 d0e5fbb..c961c23 100644 --- a/assets/js/gsec.js +++ b/assets/js/gsec.js @@ -291,7 +291,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 = /^(.+?(?= \()|.+(?! \())/; // For some reason, JS doesn't support conditional regex - const ABKURZUNG_REGEX = /\((.+?)\)/; + const ABKURZUNG_REGEX = /\((.+)\)/; const DAY_REGEX = /^(.+?), /; const PERIOD_REGEX = /, (\d+?)\. ura/; const TIME_RANGE_REGEX = /\((.+?) - (.+?)\)/; diff --git a/dist/js/gsec.js b/dist/js/gsec.js index d0e5fbb..c961c23 100644 --- a/dist/js/gsec.js +++ b/dist/js/gsec.js @@ -291,7 +291,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 = /^(.+?(?= \()|.+(?! \())/; // For some reason, JS doesn't support conditional regex - const ABKURZUNG_REGEX = /\((.+?)\)/; + const ABKURZUNG_REGEX = /\((.+)\)/; const DAY_REGEX = /^(.+?), /; const PERIOD_REGEX = /, (\d+?)\. ura/; const TIME_RANGE_REGEX = /\((.+?) - (.+?)\)/; diff --git a/dist/pages/about.html b/dist/pages/about.html index 8feacd2..7e193bf 100644 --- a/dist/pages/about.html +++ b/dist/pages/about.html @@ -142,7 +142,7 @@

- ^HEAD ad64f108d5480155fad1424e9ea958f0c2227d60 + ^HEAD 44e8c1e1c9124b36a78f775b9a7dd12152a71d98

diff --git a/dist/sw.js b/dist/sw.js index 95cefde..22ff931 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-ad64f10"; -// latest commit is ad64f108d5480155fad1424e9ea958f0c2227d60 +const static_cache_name = "site-static-1.0.13-beta-44e8c1e"; +// latest commit is 44e8c1e1c9124b36a78f775b9a7dd12152a71d98 // 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