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

Fix button selectors (.ui-button -> button)

Browse source 
Buttons in Elastic dialogs do not have this class assigned. We also
will get rid of jQuery-UI button use in the future.

Also, fixed Add Resource button state handling.
This commit is contained in:
Aleksander Machniak 2019-04-08 11:03:40 +02:00
parent f31c329ca7
commit 7ed760cda0
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
plugins/calendar/calendar_ui.js
View file

@ -565,7 +565,7 @@ function rcube_calendar_ui(settings)
open: function() { open: function() {
$dialog.attr('aria-hidden', 'false'); $dialog.attr('aria-hidden', 'false');
setTimeout(function(){ setTimeout(function(){
$dialog.parent().find('.ui-button:not(.ui-dialog-titlebar-close)').first().focus(); $dialog.parent().find('button:not(.ui-dialog-titlebar-close)').first().focus();
}, 5); }, 5);
}, },
beforeClose: function(e) { beforeClose: function(e) {
@ -1154,7 +1154,7 @@ function rcube_calendar_ui(settings)
open: function() { open: function() {
$dialog.attr('aria-hidden', 'false'); $dialog.attr('aria-hidden', 'false');
setTimeout(function(){ setTimeout(function(){
$dialog.parent().find('.ui-button:not(.ui-dialog-titlebar-close)').first().focus(); $dialog.parent().find('button:not(.ui-dialog-titlebar-close)').first().focus();
}, 5); }, 5);
}, },
close: function() { close: function() {
@ -2110,7 +2110,7 @@ function rcube_calendar_ui(settings)
height: 500 height: 500
}).show(); }).show();
$('.ui-dialog-buttonset .ui-button', $dialog.parent()).first().attr('id', 'rcmbtncalresadd'); $('.ui-dialog-buttonset button', $dialog.parent()).first().attr('id', 'rcmbtncalresadd');
me.dialog_resize($dialog.get(0), 540, Math.min(1000, $(window).width() - 50)); me.dialog_resize($dialog.get(0), 540, Math.min(1000, $(window).width() - 50));
@ -2129,7 +2129,7 @@ function rcube_calendar_ui(settings)
resources_treelist.addEventListener('select', function(node) { resources_treelist.addEventListener('select', function(node) {
if (resources_data[node.id]) { if (resources_data[node.id]) {
resource_showinfo(resources_data[node.id]); resource_showinfo(resources_data[node.id]);
rcmail.enable_command('add-resource', me.selected_event && $("#eventedit").is(':visible') ? true : false); rcmail.enable_command('add-resource', me.selected_event && $("#eventedit").is(':visible'));
// on elastic mobile display resource info box // on elastic mobile display resource info box
if ($('html.layout-small,html.layout-phone').length) { if ($('html.layout-small,html.layout-phone').length) {
@ -2152,7 +2152,7 @@ function rcube_calendar_ui(settings)
rcmail.http_request('resources-list', {}, me.loading_lock); rcmail.http_request('resources-list', {}, me.loading_lock);
// register button // register button
rcmail.register_button('add-resource', 'rcmbtncalresadd', 'uibutton'); rcmail.register_button('add-resource', 'rcmbtncalresadd', 'button');
// initialize resource calendar display // initialize resource calendar display
var resource_cal = $(rcmail.gui_objects.resourceinfocalendar); var resource_cal = $(rcmail.gui_objects.resourceinfocalendar);
@ -2373,10 +2373,8 @@ function rcube_calendar_ui(settings)
var add_resource2event = function() var add_resource2event = function()
{ {
var resource = resources_data[resources_treelist.get_selection()]; var resource = resources_data[resources_treelist.get_selection()];
if (resource) { if (resource)
if (add_attendee($.extend({ role:'REQ-PARTICIPANT', status:'NEEDS-ACTION', cutype:'RESOURCE' }, resource))) add_attendee($.extend({ role:'REQ-PARTICIPANT', status:'NEEDS-ACTION', cutype:'RESOURCE' }, resource));
rcmail.display_message(rcmail.get_label('resourceadded', 'calendar'), 'confirmation');
}
} }
// when the user accepts or declines an event invitation // when the user accepts or declines an event invitation
@ -2703,7 +2701,7 @@ function rcube_calendar_ui(settings)
buttons: buttons, buttons: buttons,
open: function() { open: function() {
setTimeout(function(){ setTimeout(function(){
$dialog.parent().find('.ui-button:not(.ui-dialog-titlebar-close)').first().focus(); $dialog.parent().find('button:not(.ui-dialog-titlebar-close)').first().focus();
}, 5); }, 5);
}, },
close: function(){ close: function(){