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: Don't act on keyboard events which originated in different dialog

Browse Source 
Fixes issue when:
1. 2 dialogs are opened
2. top dialog's close button is focused
3. user presses enter to execute 'close' action
4. dialog is immediately closed (enter key is still pressed)
5. second dialog automatically receives focus (it's top dialog now)
6. user releases the key
7. second dialog reacts to keyup event - which is by default confirmation mixin's confirm event
8. UNDESIRED behavior occurs

Now confirmation mixin remembers which keys were pressed and released and reacts only to those which originated there.

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

Reviewed-By: Adam Misnyovszki <amisnyov@redhat.com>
This commit is contained in:
Petr Vobornik 2014-01-14 17:29:47 +01:00 committed by Petr Viktorin
parent b50cdd55af
commit 9b540ef218
1 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
install/ui/src/freeipa/dialog.js
View File

@ -1245,8 +1245,17 @@ IPA.confirm_mixin = function() {
src_types: ['textarea', 'select-one']
},
/**
* Map of keys which are down
* @property {Object}
*/
keysdown: {},
/**
* Test if event is confirmation event
*
* Clears event's keyCode in `keysdown` map
*
* @param {Event} event
* @return {boolean}
*/
@ -1254,9 +1263,11 @@ IPA.confirm_mixin = function() {
var ir = this.ignore_enter_rules,
t = event.target,
key = event.keyCode,
ignore = ir.src_elements.indexOf(t.tagName.toLowerCase()) > -1 ||
ir.src_types.indexOf(t.type) > -1;
ir.src_types.indexOf(t.type) > -1 ||
!this.keysdown[key];
delete this.keysdown[key];
return ignore;
},
@ -1267,8 +1278,10 @@ IPA.confirm_mixin = function() {
register_listeners: function() {
var self = this;
this._on_key_up_listener = function(e) { self.on_key_up(e); };
this._on_key_down_listener = function(e) { self._on_key_down(e); };
var dialog_container = this.dom_node;
dialog_container.bind('keyup', this._on_key_up_listener);
dialog_container.bind('keydown', this._on_key_down_listener);
},
/**
@ -1277,6 +1290,7 @@ IPA.confirm_mixin = function() {
remove_listeners: function() {
var dialog_container = this.dom_node;
dialog_container.unbind('keyup', this._on_key_up_listener);
dialog_container.unbind('keydown', this._on_key_down_listener);
},
/**
@ -1295,6 +1309,23 @@ IPA.confirm_mixin = function() {
event.preventDefault();
this.on_cancel();
}
delete this.keysdown[event.keyCode];
},
/**
* Internal listener for saving which keys were pressed to
* prevent reaction to event which originated in completely different
* control.
*
* Example: first dialog is closed by keydown event, second is
* therefore focused and consumes keyup event which can lead to undesired
* behavior.
*
* @private
* @param {Event} event
*/
_on_key_down: function(event) {
this.keysdown[event.keyCode] = true;
}
},