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

Close autocompletion when switching tabs and closing dialog (#3389)

Browse source
This commit is contained in:
Thomas Bruederli 2014-11-04 15:35:21 +01:00
parent 673a5b37e0
commit a3aa406e05
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plugins/calendar/calendar_ui.js
View file

@ -906,7 +906,6 @@ function rcube_calendar_ui(settings)
editform.hide().attr('aria-hidden', 'true').appendTo(document.body); editform.hide().attr('aria-hidden', 'true').appendTo(document.body);
$dialog.dialog("destroy").remove(); $dialog.dialog("destroy").remove();
rcmail.ksearch_blur(); rcmail.ksearch_blur();
rcmail.ksearch_destroy();
freebusy_data = {}; freebusy_data = {};
rcmail.env.comm_path = comm_path_before; // restore comm_path rcmail.env.comm_path = comm_path_before; // restore comm_path
if (op_elem) if (op_elem)
@ -3894,6 +3893,10 @@ function rcube_calendar_ui(settings)
$('#edit-attendees-form .attendees-invitebox').show(); $('#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();
}
} }
}); });
$('#edit-enddate').datepicker(datepicker_settings); $('#edit-enddate').datepicker(datepicker_settings);

10
plugins/tasklist/tasklist.js
View file

@ -593,7 +593,14 @@ function rcube_tasklist_ui(settings)
*/ */
function init_taskedit() function init_taskedit()
{ {
$('#taskedit').tabs(); $('#taskedit').tabs({
activate: function(event, ui) {
// reset autocompletion on tab change (#3389)
if (ui.oldPanel.selector == '#taskedit-panel-attendees') {
rcmail.ksearch_blur();
}
}
});
var completeness_slider_change = function(e, ui){ var completeness_slider_change = function(e, ui){
var v = completeness_slider.slider('value'); var v = completeness_slider.slider('value');
@ -2205,6 +2212,7 @@ function rcube_tasklist_ui(settings)
closeOnEscape: false, closeOnEscape: false,
title: rcmail.gettext((action == 'edit' ? 'edittask' : 'newtask'), 'tasklist'), title: rcmail.gettext((action == 'edit' ? 'edittask' : 'newtask'), 'tasklist'),
close: function() { close: function() {
rcmail.ksearch_blur();
editform.hide().appendTo(document.body); editform.hide().appendTo(document.body);
$dialog.dialog('destroy').remove(); $dialog.dialog('destroy').remove();
}, },