Fix compatibility with Roundcube 1.3 (jQuery-UI 1.12)

This commit is contained in:
Aleksander Machniak 2016-09-08 13:20:54 +02:00
parent 87b18454ae
commit 76869bed44
2 changed files with 8 additions and 9 deletions

View file

@ -3931,23 +3931,24 @@ function rcube_calendar_ui(settings)
// init event dialog
$('#eventtabs').tabs({
activate: function(event, ui) {
if (ui.newPanel.selector == '#event-panel-attendees' || ui.newPanel.selector == '#event-panel-resources') {
var tab = ui.newPanel.selector == '#event-panel-resources' ? 'resource' : 'attendee';
// newPanel.selector for jQuery-UI 1.10, newPanel.attr('id') for jQuery-UI 1.12
var tab = String(ui.newPanel.selector || ui.newPanel.attr('id'))
.replace(/^#?event-panel-/, '').replace(/s$/, '');
if (tab == 'attendee' || tab == 'resource') {
if (!rcube_event.is_keyboard(event))
$('#edit-'+tab+'-name').select();
// update free-busy status if needed
if (freebusy_ui.needsupdate && me.selected_event)
update_freebusy_status(me.selected_event);
// add current user as organizer if non added yet
if (!event_attendees.length) {
if (tab == 'attendee' && !event_attendees.length) {
add_attendee($.extend({ role:'ORGANIZER' }, settings.identity));
$('#edit-attendees-form .attendees-invitebox').show();
}
}
// reset autocompletion on tab change (#3389)
if (ui.oldPanel.selector == '#event-panel-attendees' || ui.oldPanel.selector == '#event-panel-resources') {
rcmail.ksearch_blur();
}
rcmail.ksearch_blur();
}
});
$('#edit-enddate').datepicker(datepicker_settings);

View file

@ -651,9 +651,7 @@ function rcube_tasklist_ui(settings)
$('#taskedit').tabs({
activate: function(event, ui) {
// reset autocompletion on tab change (#3389)
if (ui.oldPanel.selector == '#taskedit-panel-attendees') {
rcmail.ksearch_blur();
}
rcmail.ksearch_blur();
}
});