kalipso/racalmas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

js/calcms.js: escape whitespaces

Browse Source
This commit is contained in:
Milan
2023-03-29 22:03:45 +02:00
parent 7ae81bb20e
commit f05861472d
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
website/agenda/js/calcms.js
View File

@@ -248,16 +248,20 @@ var calcms = (function($) {
$('#calcms_archive').on('click', action); $('#calcms_archive').on('click', action);
} }
function escapeString(s){
return encodeURIComponent(s.replaceAll(" ","+"));
}
// show all events for a given project // show all events for a given project
my.showSearchResultsByProject = function showSearchResultsByProject( my.showSearchResultsByProject = function showSearchResultsByProject(
project, value, archive) { project, value, archive) {
if (value != null && value != '') { if (value != null && value != '') {
var url = my.get('search_url'); var url = my.get('search_url');
if (project != '' && project != null) if (project != '' && project != null)
url += escape(project) + '/'; url += encodeURIComponent(project) + '/';
else else
url += 'all/'; 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 == 0) url += 'kommende/';
if (archive != null && archive == 1) url += 'vergangene/'; if (archive != null && archive == 1) url += 'vergangene/';
my.updateContainer('calcms_list', url); my.updateContainer('calcms_list', url);
@@ -269,11 +273,12 @@ var calcms = (function($) {
project, seriesName, archive) { project, seriesName, archive) {
if (seriesName != '' && seriesName != null) { if (seriesName != '' && seriesName != null) {
var url = my.get('search_series_name_url'); 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) if (seriesName != '' && seriesName != null)
url += escape(seriesName) + '/'; url += escapeString(seriesName) + '/';
if (archive != null && archive == 0) url += 'kommende/'; if (archive != null && archive == 0) url += 'kommende/';
if (archive != null && archive == 1) url += 'vergangene/'; if (archive != null && archive == 1) url += 'vergangene/';
console.log(url)
my.updateContainer('calcms_list', url); my.updateContainer('calcms_list', url);
} }
} }
@@ -282,7 +287,8 @@ var calcms = (function($) {
my.showEventsBySeriesName = function showEventsBySeriesName(value) { my.showEventsBySeriesName = function showEventsBySeriesName(value) {
if (value != '' && value != null) { if (value != '' && value != null) {
my.updateContainer('calcms_list', my.get('search_series_name_url') my.updateContainer('calcms_list', my.get('search_series_name_url')
+ escape(value) + '/'); + escapeString(value) + '/'
);
} }
} }