Skip to content
Permalink
Browse files
Dialog: Tabbing out of a modal dialog was possible because keypress d…
…oesn't fire for tabs everywhere, switched to keyup. Added Unit Test - Caught by @DomenicDenicola - Fixes #3123 - Tabbing stops in modal dialog

(cherry picked from commit 96e5c24)
  • Loading branch information
gnarf committed Aug 19, 2011
1 parent a62074d commit 8f16cc304a97c7c3c2b5ab69678d666ec9ebd75a
Showing with 33 additions and 4 deletions.
  1. +30 −1 tests/unit/dialog/dialog_tickets.js
  2. +3 −3 ui/jquery.ui.dialog.js
@@ -3,7 +3,36 @@
*/
(function($) {

module("dialog: tickets");
module( "dialog: tickets" );

asyncTest( "#3123: Prevent tabbing out of modal dialogs", function() {
expect( 3 );

var el = $( "<div><input id='t3123-first'><input id='t3123-last'></div>" ).dialog({ modal: true }),
inputs = el.find( "input" ),
widget = el.dialog( "widget" );

inputs.eq( 1 ).focus();
equal( document.activeElement, inputs[1], "Focus set on second input" );
inputs.eq( 1 ).simulate( "keyup", { keyCode: $.ui.keyCode.TAB });

setTimeout( checkTab, 2 );

function checkTab() {
ok( $.contains( widget, document.activeElement ), "Tab key event moved focus within the modal" );

// check shift tab
$( document.activeElement ).simulate( "keydown", { keyCode: $.ui.keyCode.TAB, shiftKey: true });
setTimeout( checkShiftTab, 2 );
}

function checkShiftTab() {
ok( $.contains( widget, document.activeElement ), "Shift-Tab key event moved focus within the modal" );

el.remove();
start();
}
});

test("#4826: setting resizable false toggles resizable on dialog", function() {
expect(6);
@@ -329,9 +329,9 @@ $.widget("ui.dialog", {
self.moveToTop(true);

// prevent tabbing out of modal dialogs
if (options.modal) {
uiDialog.bind('keypress.ui-dialog', function(event) {
if (event.keyCode !== $.ui.keyCode.TAB) {
if ( options.modal ) {
uiDialog.bind( "keyup.ui-dialog", function( event ) {
if ( event.keyCode !== $.ui.keyCode.TAB ) {
return;
}

0 comments on commit 8f16cc3

Please sign in to comment.