From 487e2413aec9bc352900bb90e19cb740c1a7e598 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Mon, 14 Dec 2020 14:40:24 +0100
Subject: [PATCH] Fix broken videoconference join action from tooltip call icon

---
 calendar/js/et2_widget_event.js | 7 +++++--
 calendar/js/et2_widget_event.ts | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/calendar/js/et2_widget_event.js b/calendar/js/et2_widget_event.js
index b1d05b523f..710f732945 100644
--- a/calendar/js/et2_widget_event.js
+++ b/calendar/js/et2_widget_event.js
@@ -420,7 +420,10 @@ var et2_calendar_event = /** @class */ (function (_super) {
             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'] + '">' + this.egw().lang('Video conference') +
+                    '<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();
             }
@@ -551,7 +554,7 @@ var et2_calendar_event = /** @class */ (function (_super) {
         var vc_event = 'click.calendar_videoconference';
         jQuery('body').off(vc_event)
             .on(vc_event, '[data-videoconference]', function (event) {
-            app.calendar.joinVideoConference(this.dataset.videoconference);
+            app.calendar.joinVideoConference(this.dataset.videoconference, this.dataset);
         });
     };
     /**
diff --git a/calendar/js/et2_widget_event.ts b/calendar/js/et2_widget_event.ts
index b5f55fcf07..423a9e761b 100644
--- a/calendar/js/et2_widget_event.ts
+++ b/calendar/js/et2_widget_event.ts
@@ -537,7 +537,10 @@ export class et2_calendar_event extends et2_valueWidget implements et2_IDetached
 			{
 				// Click handler is set in _bind_videoconference()
 				location += (this.options.value.location.trim() ? '<br />' : '') +
-					'<span data-videoconference="'+this.options.value['##videoconference']+ '">' + this.egw().lang('Video conference') +
+					'<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();
 			}
@@ -701,7 +704,7 @@ export class et2_calendar_event extends et2_valueWidget implements et2_IDetached
 		let vc_event = 'click.calendar_videoconference';
 		jQuery('body').off(vc_event)
 			.on(vc_event, '[data-videoconference]',function(event) {
-				app.calendar.joinVideoConference(this.dataset.videoconference);
+				app.calendar.joinVideoConference(this.dataset.videoconference, this.dataset);
 			});
 	}
 	/**