IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

WebUI: fix incorrect behavior of ESC button on combobox

Browse Source 
When combobox is opened then ESC key should close it. There was a bug
that ESC key closed also the dialog. It was caused by bad keyboard event
handling. The CB was closed by keydown event and the dialog by keyup.

Therefore the propagating of keyup and keydown event is stopped when CB
is opened (when the event is fired on CB element).

https://fedorahosted.org/freeipa/ticket/6388

Reviewed-By: Petr Vobornik <pvoborni@redhat.com>
Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
Pavel Vomacka 2017-01-04 12:28:55 +01:00 committed by Martin Babinsky
parent 1a96e7f9e7
commit 6c6c68df54
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
install/ui/src/freeipa/widget.js
View File

@ -4611,7 +4611,7 @@ IPA.combobox_widget = function(spec) {
that.list_container = $('<div/>', {
'class': 'combobox-widget-list',
css: { 'z-index': that.z_index, 'display':'none' },
keydown: that.on_list_container_keydown
keyup: that.on_list_container_keyup
}).appendTo(that.input_container);
var div = $('<div/>', {
@ -4723,7 +4723,7 @@ IPA.combobox_widget = function(spec) {
}
};
that.on_list_container_keydown = function(e) {
that.on_list_container_keyup = function(e) {
// close on ESCAPE and consume event to prevent unwanted
// behaviour like closing dialog
if (e.which == keys.ESCAPE) {
@ -4756,11 +4756,16 @@ IPA.combobox_widget = function(spec) {
e.preventDefault();
that.select_next();
that.list.focus();
} else if (key === keys.ESCAPE) {
e.stopPropagation();
}
};
that.list_on_keydown = function(e) {
if (e.which === keys.TAB) {
if (e.which === keys.ESCAPE) {
e.stopPropagation();
return false;
} else if (e.which === keys.TAB) {
e.preventDefault();
if (that.searchable) {
that.filter.focus();