Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Elastic: Fix RSVP recurring menu

Browse source 
Use rcmail's menu instead of jQuery-UI's menu.
This commit is contained in:
Aleksander Machniak 2019-03-12 17:40:00 +00:00
parent 2479385e04
commit bc4a639e64
2 changed files with 19 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/calendar/calendar_ui.js
View file

@ -2380,7 +2380,7 @@ function rcube_calendar_ui(settings)
} }
// when the user accepts or declines an event invitation // when the user accepts or declines an event invitation
var event_rsvp = function(response, delegate, replymode) var event_rsvp = function(response, delegate, replymode, event)
{ {
var btn; var btn;
if (typeof response == 'object') { if (typeof response == 'object') {
@ -2394,8 +2394,8 @@ function rcube_calendar_ui(settings)
// show menu to select rsvp reply mode (current or all) // show menu to select rsvp reply mode (current or all)
if (me.selected_event && me.selected_event.recurrence && !replymode) { if (me.selected_event && me.selected_event.recurrence && !replymode) {
rcube_libcalendaring.itip_rsvp_recurring(btn, function(resp, mode) { rcube_libcalendaring.itip_rsvp_recurring(btn, function(resp, mode) {
event_rsvp(resp, null, mode); event_rsvp(resp, null, mode, event);
}); }, event);
return; return;
} }
@ -2404,7 +2404,7 @@ function rcube_calendar_ui(settings)
if (response == 'delegated' && !delegate) { if (response == 'delegated' && !delegate) {
rcube_libcalendaring.itip_delegate_dialog(function(data) { rcube_libcalendaring.itip_delegate_dialog(function(data) {
data.rsvp = data.rsvp ? 1 : ''; data.rsvp = data.rsvp ? 1 : '';
event_rsvp('delegated', data, replymode); event_rsvp('delegated', data, replymode, event);
}); });
return; return;
} }
@ -4059,7 +4059,7 @@ function rcube_calendar_ui(settings)
}); });
$('#event-rsvp input.button').click(function(e) { $('#event-rsvp input.button').click(function(e) {
event_rsvp(this) event_rsvp(this, null, null, e.originalEvent);
}); });
$('#eventedit input.edit-recurring-savemode').change(function(e) { $('#eventedit input.edit-recurring-savemode').change(function(e) {

37
plugins/libcalendaring/libcalendaring.js
View file

@ -1311,36 +1311,25 @@ rcube_libcalendaring.itip_delegate_dialog = function(callback, selector)
/** /**
* Show a menu for selecting the RSVP reply mode * Show a menu for selecting the RSVP reply mode
*/ */
rcube_libcalendaring.itip_rsvp_recurring = function(btn, callback) rcube_libcalendaring.itip_rsvp_recurring = function(btn, callback, event)
{ {
var menu = $('<ul></ul>').attr('class', 'popupmenu libcal-rsvp-replymode'); var list, lc, menu = $('#itip-rsvp-menu'), action = btn.attr('rel');
if (!menu.length) {
lc = $('body > #layout').length === 1 ? 'toolbarmenu listing' : 'toolbarmenu';
menu = $('<div>').attr({'class': 'popupmenu', id: 'itip-rsvp-menu', 'aria-hidden': 'true'}).appendTo(document.body);
list = $('<ul>').attr({'class': lc, role: 'menu'}).appendTo(menu);
$.each(['all','current'/*,'future'*/], function(i, mode) { $.each(['all','current'/*,'future'*/], function(i, mode) {
$('<li>') var link = $('<a>').attr({'class': 'active', rel: mode})
.attr({rel: mode, 'class': 'ui-menu-item'}) .text(rcmail.get_label('rsvpmode' + mode))
.append($('<a>').attr({tabindex: "0", 'class': 'ui-menu-item-wrapper'}) .on('click', function() { callback(action, $(this).attr('rel')); });
.text(rcmail.get_label('rsvpmode' + mode)))
.appendTo(menu); $('<li>').attr({role: 'menuitem'}).append(link).appendTo(list);
}); });
var action = btn.attr('rel');
// open the menu
menu.menu({
select: function(event, ui) {
callback(action, ui.item.attr('rel'));
} }
})
.appendTo(document.body)
.position({ my: 'left top', at: 'left bottom+2', of: btn })
.data('action', action);
setTimeout(function() { rcmail.show_menu('itip-rsvp-menu', true, event);
$(document).one('click', function() {
menu.menu('destroy');
menu.remove();
});
}, 100);
}; };
/** /**