library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2025-01-07 20:34:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Dialog: Search the correct document for focus trapping. Fixes #9439 - Dialog: Context is not respected for modals.

Browse Source
This commit is contained in:
Scott González 2013-08-06 15:06:08 -04:00
parent 92d5421395
commit c9815f13b4
2 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/unit/dialog/dialog_methods.js
View File

@ -63,21 +63,21 @@ test("destroy", function() {
// Don't throw errors when destroying a never opened modal dialog (#9004) // Don't throw errors when destroying a never opened modal dialog (#9004)
$( "#dialog1" ).dialog({ autoOpen: false, modal: true }).dialog( "destroy" ); $( "#dialog1" ).dialog({ autoOpen: false, modal: true }).dialog( "destroy" );
equal( $( ".ui-widget-overlay" ).length, 0, "overlay does not exist" ); equal( $( ".ui-widget-overlay" ).length, 0, "overlay does not exist" );
equal( $.ui.dialog.overlayInstances, 0, "overlayInstances equals the number of open overlays"); equal( $( document ).data( "ui-dialog-overlays" ), undefined, "ui-dialog-overlays equals the number of open overlays");
element = $( "#dialog1" ).dialog({ modal: true }), element = $( "#dialog1" ).dialog({ modal: true }),
element2 = $( "#dialog2" ).dialog({ modal: true }); element2 = $( "#dialog2" ).dialog({ modal: true });
equal( $( ".ui-widget-overlay" ).length, 2, "overlays created when dialogs are open" ); equal( $( ".ui-widget-overlay" ).length, 2, "overlays created when dialogs are open" );
equal( $.ui.dialog.overlayInstances, 2, "overlayInstances equals the number of open overlays" ); equal( $( document ).data( "ui-dialog-overlays" ), 2, "ui-dialog-overlays equals the number of open overlays" );
element.dialog( "close" ); element.dialog( "close" );
equal( $( ".ui-widget-overlay" ).length, 1, "overlay remains after closing one dialog" ); equal( $( ".ui-widget-overlay" ).length, 1, "overlay remains after closing one dialog" );
equal( $.ui.dialog.overlayInstances, 1, "overlayInstances equals the number of open overlays" ); equal( $( document ).data( "ui-dialog-overlays" ), 1, "ui-dialog-overlays equals the number of open overlays" );
element.dialog( "destroy" ); element.dialog( "destroy" );
equal( $( ".ui-widget-overlay" ).length, 1, "overlay remains after destroying one dialog" ); equal( $( ".ui-widget-overlay" ).length, 1, "overlay remains after destroying one dialog" );
equal( $.ui.dialog.overlayInstances, 1, "overlayInstances equals the number of open overlays" ); equal( $( document ).data( "ui-dialog-overlays" ), 1, "ui-dialog-overlays equals the number of open overlays" );
element2.dialog( "destroy" ); element2.dialog( "destroy" );
equal( $( ".ui-widget-overlay" ).length, 0, "overlays removed when all dialogs are destoryed" ); equal( $( ".ui-widget-overlay" ).length, 0, "overlays removed when all dialogs are destoryed" );
equal( $.ui.dialog.overlayInstances, 0, "overlayInstances equals the number of open overlays" ); equal( $( document ).data( "ui-dialog-overlays" ), undefined, "ui-dialog-overlays equals the number of open overlays" );
}); });
asyncTest("#9000: Dialog leaves broken event handler after close/destroy in certain cases", function() { asyncTest("#9000: Dialog leaves broken event handler after close/destroy in certain cases", function() {

53
ui/jquery.ui.dialog.js vendored
View File

@ -724,22 +724,27 @@ $.widget( "ui.dialog", {
return; return;
} }
var that = this, // We use a delay in case the overlay is created from an
widgetFullName = this.widgetFullName; // event that we're going to be cancelling (#2804)
if ( !$.ui.dialog.overlayInstances ) { var isOpening = true;
// Prevent use of anchors and inputs. this._delay(function() {
// We use a delay in case the overlay is created from an isOpening = false;
// event that we're going to be cancelling. (#2804) });
this._delay(function() {
// Handle .dialog().dialog("close") (#4065) if ( !this.document.data( "ui-dialog-overlays" ) ) {
if ( $.ui.dialog.overlayInstances ) {
this.document.bind( "focusin.dialog", function( event ) { // Prevent use of anchors and inputs
if ( !that._allowInteraction( event ) ) { this._on( this.document, {
event.preventDefault(); focusin: function( event ) {
$(".ui-dialog:visible:last .ui-dialog-content") if ( isOpening ) {
.data( widgetFullName )._focusTabbable(); return;
} }
});
if ( !this._allowInteraction( event ) ) {
event.preventDefault();
this.document.find( ".ui-dialog:visible:last .ui-dialog-content" )
.data( this.widgetFullName )._focusTabbable();
}
} }
}); });
} }
@ -750,7 +755,8 @@ $.widget( "ui.dialog", {
this._on( this.overlay, { this._on( this.overlay, {
mousedown: "_keepFocus" mousedown: "_keepFocus"
}); });
$.ui.dialog.overlayInstances++; this.document.data( "ui-dialog-overlays",
(this.document.data( "ui-dialog-overlays" ) || 0) + 1 );
}, },
_destroyOverlay: function() { _destroyOverlay: function() {
@ -759,17 +765,20 @@ $.widget( "ui.dialog", {
} }
if ( this.overlay ) { if ( this.overlay ) {
$.ui.dialog.overlayInstances--; var overlays = this.document.data( "ui-dialog-overlays" ) - 1;
if ( !$.ui.dialog.overlayInstances ) { if ( !overlays ) {
this.document.unbind( "focusin.dialog" ); this.document
.off( "focusin" )
.removeData( "ui-dialog-overlays" );
} else {
this.document.data( "ui-dialog-overlays", overlays );
} }
this.overlay.remove(); this.overlay.remove();
this.overlay = null; this.overlay = null;
} }
} }
}); });
$.ui.dialog.overlayInstances = 0;
}( jQuery ) ); }( jQuery ) );