diff options
Diffstat (limited to '')
-rw-r--r-- | config.scm | 13 | ||||
-rw-r--r-- | static/user/user-additions.js | 2 |
2 files changed, 6 insertions, 9 deletions
@@ -84,18 +84,15 @@ [else (list line '(br))]))) (string-split str #\newline))) -(define html-cals - '("D-sektionens officiella kalender" - "LiTHe kod" - "Klassfadder 2020")) +(define html-rx + (make-regexp "</?\\w+( +\\w+(=[\"']?\\w+[\"']?)?)* */?>")) ((@ (calp html filter) description-filter) (lambda (ev str) - (cond [(member (prop (parent ev) 'NAME) - html-cals) - (parse-html str)] - [(prop ev 'X-MICROSOFT-SKYPETEAMSMEETINGURL) + (cond [(prop ev 'X-MICROSOFT-SKYPETEAMSMEETINGURL) (parse-teams-description str)] + [(regexp-exec html-rx str) + (parse-html str)] [else (parse-links str)]))) ((@ (datetime) week-start) mon) diff --git a/static/user/user-additions.js b/static/user/user-additions.js index d357b4b5..0de825e8 100644 --- a/static/user/user-additions.js +++ b/static/user/user-additions.js @@ -1,5 +1,5 @@ window.formatters.set('description', (el, d) => { - if (/<\/?\w+( \w+(="?\w+"?)?)*\/?>/.exec(d)) { + if (/<\/?\w+( +\w+(=["']?\w+["']?)?)* *\/?>/.exec(d)) { /* Assume that the text is HTML if it contains something which looks like an HTML tag */ let parser = new DOMParser(); |