extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-24 17:04:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: Fixed activate links in location & description for 21.1

Browse Source
This commit is contained in:
nathan 2021-09-23 14:50:23 -06:00
parent 0de779e162
commit 1537546071
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
calendar/js/et2_widget_event.js
View File

@ -417,11 +417,19 @@ var et2_calendar_event = /** @class */ (function (_super) {
} }
cat.destroy(); cat.destroy();
} }
// Activate links in description
var description_node = document.createElement("p");
description_node.className = "calendar_calEvent_description";
et2_insertLinkText(et2_activateLinks(egw.htmlspecialchars(this.options.value.description)), description_node, '_blank');
// Location + Videoconference // Location + Videoconference
var location = ''; var location = '';
if (this.options.value.location || this.options.value['##videoconference']) { if (this.options.value.location || this.options.value['##videoconference']) {
location += '<p><span class="calendar_calEventLabel">' + this.egw().lang('Location') + '</span>:' + location = '<p>';
egw.htmlspecialchars(this.options.value.location); var location_node = document.createElement("span");
location_node.className = "calendar_calEventLabel";
et2_insertLinkText(et2_activateLinks(this.egw().lang('Location') + ':' +
egw.htmlspecialchars(this.options.value.location)), location_node, '_blank');
location += location_node.outerHTML;
if (this.options.value['##videoconference']) { if (this.options.value['##videoconference']) {
// Click handler is set in _bind_videoconference() // Click handler is set in _bind_videoconference()
location += (this.options.value.location.trim() ? '<br />' : '') + location += (this.options.value.location.trim() ? '<br />' : '') +
@ -453,7 +461,7 @@ var et2_calendar_event = /** @class */ (function (_super) {
'</div>' + '</div>' +
'<div class="calendar_calEventBody">' + '<div class="calendar_calEventBody">' +
'<h1 class="calendar_calEventTitle">' + egw.htmlspecialchars(this.options.value.title) + '</h1><br><p>' + '<h1 class="calendar_calEventTitle">' + egw.htmlspecialchars(this.options.value.title) + '</h1><br><p>' +
egw.htmlspecialchars(this.options.value.description) + '</p>' + description_node.outerHTML +
'<p style="margin: 2px 0px;">' + times + '</p>' + '<p style="margin: 2px 0px;">' + times + '</p>' +
location + location +
(cat_label ? '<p><h2 class="calendar_calEventLabel">' + this.egw().lang('Category') + ':</h2>' + cat_label + '</p>' : '') + (cat_label ? '<p><h2 class="calendar_calEventLabel">' + this.egw().lang('Category') + ':</h2>' + cat_label + '</p>' : '') +

27
calendar/js/et2_widget_event.ts
View File

@ -531,19 +531,32 @@ export class et2_calendar_event extends et2_valueWidget implements et2_IDetached
cat.destroy(); cat.destroy();
} }
// Activate links in description
let description_node = document.createElement("p");
description_node.className = "calendar_calEvent_description";
et2_insertLinkText(
et2_activateLinks(egw.htmlspecialchars(this.options.value.description)), description_node, '_blank'
);
// Location + Videoconference // Location + Videoconference
let location = ''; let location = '';
if(this.options.value.location || this.options.value['##videoconference']) if(this.options.value.location || this.options.value['##videoconference'])
{ {
location += '<p><span class="calendar_calEventLabel">' + this.egw().lang('Location') + '</span>:' + location = '<p>';
egw.htmlspecialchars(this.options.value.location); let location_node = document.createElement("span");
if(this.options.value['##videoconference']) location_node.className = "calendar_calEventLabel";
et2_insertLinkText(et2_activateLinks(
this.egw().lang('Location') + ':' +
egw.htmlspecialchars(this.options.value.location)), location_node, '_blank');
location += location_node.outerHTML;
if (this.options.value['##videoconference'])
{ {
// Click handler is set in _bind_videoconference() // Click handler is set in _bind_videoconference()
location += (this.options.value.location.trim() ? '<br />' : '') + location += (this.options.value.location.trim() ? '<br />' : '') +
'<span data-videoconference="'+this.options.value['##videoconference']+ '<span data-videoconference="' + this.options.value['##videoconference'] +
'" data-id="'+this.options.value['id']+'" data-title="'+this.options.value['title']+ '" data-id="' + this.options.value['id'] + '" data-title="' + this.options.value['title'] +
'" data-start="'+this.options.value['start'].toJSON()+'" data-end="'+this.options.value['end'].toJSON()+ '">'+ '" data-start="' + this.options.value['start'].toJSON() + '" data-end="' + this.options.value['end'].toJSON() + '">' +
this.egw().lang('Video conference') + this.egw().lang('Video conference') +
'<img src="' + this.egw().image('videoconference', 'calendar') + '"/></span>'; '<img src="' + this.egw().image('videoconference', 'calendar') + '"/></span>';
this._bind_videoconference(); this._bind_videoconference();
@ -574,7 +587,7 @@ export class et2_calendar_event extends et2_valueWidget implements et2_IDetached
'</div>'+ '</div>'+
'<div class="calendar_calEventBody">'+ '<div class="calendar_calEventBody">'+
'<h1 class="calendar_calEventTitle">'+egw.htmlspecialchars(this.options.value.title)+'</h1><br><p>'+ '<h1 class="calendar_calEventTitle">'+egw.htmlspecialchars(this.options.value.title)+'</h1><br><p>'+
egw.htmlspecialchars(this.options.value.description)+'</p>'+ description_node.outerHTML +
'<p style="margin: 2px 0px;">'+times+'</p>'+ '<p style="margin: 2px 0px;">'+times+'</p>'+
location + location +
(cat_label ? '<p><h2 class="calendar_calEventLabel">'+this.egw().lang('Category') + ':</h2>' + cat_label +'</p>' : '')+ (cat_label ? '<p><h2 class="calendar_calEventLabel">'+this.egw().lang('Category') + ':</h2>' + cat_label +'</p>' : '')+