From 15375460714e1ba0339ceea63ddc2eda73f8dbbe Mon Sep 17 00:00:00 2001
From: nathan <nathangray.bsc+github@gmail.com>
Date: Thu, 23 Sep 2021 14:50:23 -0600
Subject: [PATCH] Calendar: Fixed activate links in location & description for
 21.1

---
 calendar/js/et2_widget_event.js | 14 +++++++++++---
 calendar/js/et2_widget_event.ts | 27 ++++++++++++++++++++-------
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/calendar/js/et2_widget_event.js b/calendar/js/et2_widget_event.js
index e322c28e00..c664787857 100644
--- a/calendar/js/et2_widget_event.js
+++ b/calendar/js/et2_widget_event.js
@@ -417,11 +417,19 @@ var et2_calendar_event = /** @class */ (function (_super) {
             }
             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
         var location = '';
         if (this.options.value.location || this.options.value['##videoconference']) {
-            location += '<p><span class="calendar_calEventLabel">' + this.egw().lang('Location') + '</span>:' +
-                egw.htmlspecialchars(this.options.value.location);
+            location = '<p>';
+            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']) {
                 // Click handler is set in _bind_videoconference()
                 location += (this.options.value.location.trim() ? '<br />' : '') +
@@ -453,7 +461,7 @@ var et2_calendar_event = /** @class */ (function (_super) {
             '</div>' +
             '<div class="calendar_calEventBody">' +
             '<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>' +
             location +
             (cat_label ? '<p><h2 class="calendar_calEventLabel">' + this.egw().lang('Category') + ':</h2>' + cat_label + '</p>' : '') +
diff --git a/calendar/js/et2_widget_event.ts b/calendar/js/et2_widget_event.ts
index 6b4fd075af..25d6e41512 100644
--- a/calendar/js/et2_widget_event.ts
+++ b/calendar/js/et2_widget_event.ts
@@ -531,19 +531,32 @@ export class et2_calendar_event extends et2_valueWidget implements et2_IDetached
 			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
 		let location = '';
 		if(this.options.value.location || this.options.value['##videoconference'])
 		{
-			location += '<p><span class="calendar_calEventLabel">' + this.egw().lang('Location') + '</span>:' +
-				egw.htmlspecialchars(this.options.value.location);
-			if(this.options.value['##videoconference'])
+			location = '<p>';
+			let 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'])
 			{
 				// Click handler is set in _bind_videoconference()
 				location += (this.options.value.location.trim() ? '<br />' : '') +
-					'<span data-videoconference="'+this.options.value['##videoconference']+
-					'" 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()+ '">'+
+					'<span data-videoconference="' + this.options.value['##videoconference'] +
+					'" 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() + '">' +
 					this.egw().lang('Video conference') +
 					'<img src="' + this.egw().image('videoconference', 'calendar') + '"/></span>';
 				this._bind_videoconference();
@@ -574,7 +587,7 @@ export class et2_calendar_event extends et2_valueWidget implements et2_IDetached
 			'</div>'+
 			'<div class="calendar_calEventBody">'+
 				'<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>'+
 				location +
 				(cat_label ? '<p><h2 class="calendar_calEventLabel">'+this.egw().lang('Category') + ':</h2>' + cat_label +'</p>' : '')+