extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 23:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken videoconference join action from tooltip call icon

Browse Source
This commit is contained in:
Hadi Nategh 2020-12-14 14:40:24 +01:00
parent 8c078ea23f
commit 487e2413ae
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
calendar/js/et2_widget_event.js
View File

@ -420,7 +420,10 @@ var et2_calendar_event = /** @class */ (function (_super) {
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 />' : '') +
'<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>'; '<img src="' + this.egw().image('videoconference', 'calendar') + '"/></span>';
this._bind_videoconference(); this._bind_videoconference();
} }
@ -551,7 +554,7 @@ var et2_calendar_event = /** @class */ (function (_super) {
var vc_event = 'click.calendar_videoconference'; var vc_event = 'click.calendar_videoconference';
jQuery('body').off(vc_event) jQuery('body').off(vc_event)
.on(vc_event, '[data-videoconference]', function (event) { .on(vc_event, '[data-videoconference]', function (event) {
app.calendar.joinVideoConference(this.dataset.videoconference); app.calendar.joinVideoConference(this.dataset.videoconference, this.dataset);
}); });
}; };
/** /**

7
calendar/js/et2_widget_event.ts
View File

@ -537,7 +537,10 @@ export class et2_calendar_event extends et2_valueWidget implements et2_IDetached
{ {
// 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']+ '">' + 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>'; '<img src="' + this.egw().image('videoconference', 'calendar') + '"/></span>';
this._bind_videoconference(); this._bind_videoconference();
} }
@ -701,7 +704,7 @@ export class et2_calendar_event extends et2_valueWidget implements et2_IDetached
let vc_event = 'click.calendar_videoconference'; let vc_event = 'click.calendar_videoconference';
jQuery('body').off(vc_event) jQuery('body').off(vc_event)
.on(vc_event, '[data-videoconference]',function(event) { .on(vc_event, '[data-videoconference]',function(event) {
app.calendar.joinVideoConference(this.dataset.videoconference); app.calendar.joinVideoConference(this.dataset.videoconference, this.dataset);
}); });
} }
/** /**