From 7ae81bb20e497ef46b1fe963fa6b368e8b7ec988 Mon Sep 17 00:00:00 2001 From: Milan Date: Wed, 29 Mar 2023 21:58:10 +0200 Subject: [PATCH 1/3] index.html: remove --- website/index.html | 1 - 1 file changed, 1 deletion(-) delete mode 100644 website/index.html diff --git a/website/index.html b/website/index.html deleted file mode 100644 index 9daeafb..0000000 --- a/website/index.html +++ /dev/null @@ -1 +0,0 @@ -test From f05861472d763cb8472e6c9655a9f88e1a1e2926 Mon Sep 17 00:00:00 2001 From: Milan Date: Wed, 29 Mar 2023 22:03:45 +0200 Subject: [PATCH 2/3] js/calcms.js: escape whitespaces --- website/agenda/js/calcms.js | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/website/agenda/js/calcms.js b/website/agenda/js/calcms.js index b31a02f..c4dd28d 100644 --- a/website/agenda/js/calcms.js +++ b/website/agenda/js/calcms.js @@ -248,16 +248,20 @@ var calcms = (function($) { $('#calcms_archive').on('click', action); } + function escapeString(s){ + return encodeURIComponent(s.replaceAll(" ","+")); + } + // show all events for a given project my.showSearchResultsByProject = function showSearchResultsByProject( project, value, archive) { if (value != null && value != '') { var url = my.get('search_url'); if (project != '' && project != null) - url += escape(project) + '/'; + url += encodeURIComponent(project) + '/'; else url += 'all/'; - if (value != '' && value != null) url += escape(value) + '/'; + if (value != '' && value != null) url += escapeString(value) + '/'; if (archive != null && archive == 0) url += 'kommende/'; if (archive != null && archive == 1) url += 'vergangene/'; my.updateContainer('calcms_list', url); @@ -269,11 +273,12 @@ var calcms = (function($) { project, seriesName, archive) { if (seriesName != '' && seriesName != null) { var url = my.get('search_series_name_url'); - if (project != '' && project != null) url += escape(project) + '/'; + if (project != '' && project != null) url += escapeString(project) + '/'; if (seriesName != '' && seriesName != null) - url += escape(seriesName) + '/'; + url += escapeString(seriesName) + '/'; if (archive != null && archive == 0) url += 'kommende/'; if (archive != null && archive == 1) url += 'vergangene/'; + console.log(url) my.updateContainer('calcms_list', url); } } @@ -282,7 +287,8 @@ var calcms = (function($) { my.showEventsBySeriesName = function showEventsBySeriesName(value) { if (value != '' && value != null) { my.updateContainer('calcms_list', my.get('search_series_name_url') - + escape(value) + '/'); + + escapeString(value) + '/' + ); } } From efb17c91c24685409e2563212af7d8b102aa0b85 Mon Sep 17 00:00:00 2001 From: Milan Date: Wed, 29 Mar 2023 22:05:44 +0200 Subject: [PATCH 3/3] calcms*.js: remove debugging --- website/agenda/js/calcms.cust.js | 1 - website/agenda/js/calcms.js | 2 -- 2 files changed, 3 deletions(-) diff --git a/website/agenda/js/calcms.cust.js b/website/agenda/js/calcms.cust.js index 6c08817..f60dbd5 100644 --- a/website/agenda/js/calcms.cust.js +++ b/website/agenda/js/calcms.cust.js @@ -137,7 +137,6 @@ var calcms_settings = new Array(); var pattern = new RegExp(key); var matchs = pattern.exec(url); if ((matchs != null) && (matchs.length > 0)) { - console.log("matchs " + url) $('div.entry-content').append('
') calcms.updateContainer("#result", editorsUrl); } diff --git a/website/agenda/js/calcms.js b/website/agenda/js/calcms.js index c4dd28d..4a4d4c5 100644 --- a/website/agenda/js/calcms.js +++ b/website/agenda/js/calcms.js @@ -278,7 +278,6 @@ var calcms = (function($) { url += escapeString(seriesName) + '/'; if (archive != null && archive == 0) url += 'kommende/'; if (archive != null && archive == 1) url += 'vergangene/'; - console.log(url) my.updateContainer('calcms_list', url); } } @@ -437,7 +436,6 @@ var calcms = (function($) { event_id, event_start) { var url = my.get('comments_url') || '/agenda/kommentare/'; if (event_id == '' || event_start == '' || url == '') return false; - console.log("showCommentsByEventIdOrEventStart url=" + url); my.set('comments_event_start', event_start); my.set('comments_event_id', event_id);