From f31c329ca78f6be84bb6177a0852e21f4dcb1798 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 8 Apr 2019 10:35:45 +0200 Subject: [PATCH] Fix button selectors (.ui-button -> button) Buttons in Elastic dialogs do not have this class assigned. We also will get rid of jQuery-UI button use in the future. --- plugins/kolab_2fa/kolab2fa.js | 4 ++-- plugins/kolab_files/kolab_files.js | 2 +- plugins/kolab_notes/notes.js | 4 ++-- plugins/kolab_notes/notes_mail.js | 2 +- plugins/libcalendaring/libcalendaring.js | 6 +++--- plugins/tasklist/tasklist.js | 6 ++---- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/plugins/kolab_2fa/kolab2fa.js b/plugins/kolab_2fa/kolab2fa.js index 9114a3f3..cec01651 100644 --- a/plugins/kolab_2fa/kolab2fa.js +++ b/plugins/kolab_2fa/kolab2fa.js @@ -100,7 +100,7 @@ window.rcmail && rcmail.addEventListener('init', function(evt) { open: function(event, ui) { $(event.target).find('input[name="_verify_code"]').keypress(function(e) { if (e.which == 13) { - $(e.target).closest('.ui-dialog').find('.ui-button.mainaction').click(); + $(e.target).closest('.ui-dialog').find('button.mainaction').click(); } }); }, @@ -242,7 +242,7 @@ window.rcmail && rcmail.addEventListener('init', function(evt) { // submit code on $(event.target).find('input[name="_code"]').keypress(function(e) { if (e.which == 13) { - $(e.target).closest('.ui-dialog').find('.ui-button.mainaction').click(); + $(e.target).closest('.ui-dialog').find('button.mainaction').click(); } }).select(); }, diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js index af4e13a6..9ff0f456 100644 --- a/plugins/kolab_files/kolab_files.js +++ b/plugins/kolab_files/kolab_files.js @@ -951,7 +951,7 @@ function kolab_dialog_show(content, params, onopen) // Handle form submit with Enter key, click first dialog button instead function kolab_dialog_submit_handler() { - $(this).parents('.ui-dialog').find('.ui-button').first().click(); + $(this).parents('.ui-dialog').find('.ui-dialog-buttonpane button').first().click(); return false; }; diff --git a/plugins/kolab_notes/notes.js b/plugins/kolab_notes/notes.js index c459e512..d0866f15 100644 --- a/plugins/kolab_notes/notes.js +++ b/plugins/kolab_notes/notes.js @@ -1316,8 +1316,8 @@ function rcube_kolab_notes_ui(settings) dialogClass: 'warning', open: function(event, ui) { $(this).parent().find('.ui-dialog-titlebar-close').hide(); - setTimeout(function(){ - dialog.parent().find('.ui-button:visible').first().focus(); + setTimeout(function() { + dialog.parent().find('button:visible').first().focus(); }, 10); }, close: function(event, ui) { diff --git a/plugins/kolab_notes/notes_mail.js b/plugins/kolab_notes/notes_mail.js index a3ad893f..deb831f4 100644 --- a/plugins/kolab_notes/notes_mail.js +++ b/plugins/kolab_notes/notes_mail.js @@ -39,7 +39,7 @@ window.rcmail && rcmail.addEventListener('init', function(evt) { edit = url._id, title = edit ? rcmail.gettext('kolab_notes.editnote') : rcmail.gettext('kolab_notes.appendnote'), dialog_render = function(p) { - $dialog.parent().find('.ui-dialog-buttonset .ui-button') + $dialog.parent().find('.ui-dialog-buttonset button') .prop('disabled', p.readonly) .last().prop('disabled', false); }; diff --git a/plugins/libcalendaring/libcalendaring.js b/plugins/libcalendaring/libcalendaring.js index b49fac10..5ac06542 100644 --- a/plugins/libcalendaring/libcalendaring.js +++ b/plugins/libcalendaring/libcalendaring.js @@ -759,7 +759,7 @@ function rcube_libcalendaring(settings) buttons: buttons, open: function() { setTimeout(function() { - me.alarm_dialog.parent().find('.ui-button:not(.ui-dialog-titlebar-close)').first().focus(); + me.alarm_dialog.parent().find('button:not(.ui-dialog-titlebar-close)').first().focus(); }, 5); }, close: function() { @@ -1289,7 +1289,7 @@ rcube_libcalendaring.itip_delegate_dialog = function(callback, selector) dialog = rcmail.show_popup_dialog(form, rcmail.gettext('delegateinvitation', 'itip'), buttons, { width: 460, open: function(event, ui) { - $(this).parent().find('.ui-button:not(.ui-dialog-titlebar-close)').first().addClass('mainaction'); + $(this).parent().find('button:not(.ui-dialog-titlebar-close)').first().addClass('mainaction'); $(this).find('#itip-saveto').val(''); // initialize autocompletion @@ -1380,7 +1380,7 @@ rcube_libcalendaring.decline_attendee_reply = function(mime_id, task) dialog = rcmail.show_popup_dialog(html, rcmail.gettext('declineattendee', 'itip'), buttons, { width: 460, open: function() { - $(this).parent().find('.ui-button:not(.ui-dialog-titlebar-close)').first().addClass('mainaction'); + $(this).parent().find('button:not(.ui-dialog-titlebar-close)').first().addClass('mainaction'); $('#itip-decline-comment').focus(); } }); diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js index 731e56c2..4ea00671 100644 --- a/plugins/tasklist/tasklist.js +++ b/plugins/tasklist/tasklist.js @@ -1300,7 +1300,6 @@ function rcube_tasklist_ui(settings) if (!rcmail.busy) { saving_lock = rcmail.set_busy(true, 'tasklist.savingdata'); rcmail.http_post('tasks/task', { action:action, t:rec, filter:filtermask }); - $('button.ui-button:ui-button').button('option', 'disabled', rcmail.busy); return true; } @@ -1382,7 +1381,7 @@ function rcube_tasklist_ui(settings) buttons: buttons, open: 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); }, close: function(){ @@ -1404,7 +1403,6 @@ function rcube_tasklist_ui(settings) { if (saving_lock) { rcmail.set_busy(false, null, saving_lock); - $('button.ui-button:ui-button').button('option', 'disabled', false); saving_lock = null; // Elastic @@ -2183,7 +2181,7 @@ function rcube_tasklist_ui(settings) closeOnEscape: true, title: rcmail.gettext('taskdetails', 'tasklist'), open: function() { - $dialog.parent().find('.ui-button:not(.ui-dialog-titlebar-close)').first().focus(); + $dialog.parent().find('button:not(.ui-dialog-titlebar-close)').first().focus(); }, close: function() { $dialog.dialog('destroy').appendTo(document.body);