library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2024-11-21 11:04:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Dialog: modified _createOverlay to _appendTo instead of document.body. Fixed #8984 - Modal dialogs display behind overlay when using appendTo option

Browse Source
This commit is contained in:
David Sullivan 2013-01-26 04:03:14 -06:00 committed by Mike Sherov
parent c53198c209
commit 55360eeb7e
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tests/unit/dialog/dialog_options.js
View File

@ -6,43 +6,63 @@
module("dialog: options"); module("dialog: options");
test( "appendTo", function() { test( "appendTo", function() {
expect( 8 ); expect( 16 );
var detached = $( "<div>" ), var detached = $( "<div>" ),
element = $( "#dialog1" ).dialog(); element = $( "#dialog1" ).dialog({
modal: true
});
equal( element.dialog( "widget" ).parent()[0], document.body, "defaults to body" ); equal( element.dialog( "widget" ).parent()[0], document.body, "defaults to body" );
equal( $( ".ui-widget-overlay" ).parent()[0], document.body, "overlay defaults to body" );
element.dialog( "destroy" ); element.dialog( "destroy" );
element.dialog({ element.dialog({
appendTo: ".wrap" appendTo: ".wrap",
modal: true
}); });
equal( element.dialog( "widget" ).parent()[0], $( "#wrap1" )[0], "first found element" ); equal( element.dialog( "widget" ).parent()[0], $( "#wrap1" )[0], "first found element" );
equal( $( ".ui-widget-overlay" ).parent()[0], $( "#wrap1" )[0], "overlay first found element" );
equal( $( "#wrap2 .ui-dialog" ).length, 0, "only appends to one element" ); equal( $( "#wrap2 .ui-dialog" ).length, 0, "only appends to one element" );
equal( $( "#wrap2 .ui-widget-overlay" ).length, 0, "overlay only appends to one element" );
element.dialog( "destroy" ); element.dialog( "destroy" );
element.dialog({ element.dialog({
appendTo: null appendTo: null,
modal: true
}); });
equal( element.dialog( "widget" ).parent()[0], document.body, "null" ); equal( element.dialog( "widget" ).parent()[0], document.body, "null" );
element.dialog( "destroy" ); equal( $( ".ui-widget-overlay" ).parent()[0], document.body, "overlay null" );
element.dialog({ autoOpen: false }).dialog( "option", "appendTo", "#wrap1" ).dialog( "open" );
equal( element.dialog( "widget" ).parent()[0], $( "#wrap1" )[0], "modified after init" );
element.dialog( "destroy" ); element.dialog( "destroy" );
element.dialog({ element.dialog({
appendTo: detached autoOpen: false,
modal: true
}).dialog( "option", "appendTo", "#wrap1" ).dialog( "open" );
equal( element.dialog( "widget" ).parent()[0], $( "#wrap1" )[0], "modified after init" );
equal( $( ".ui-widget-overlay" ).parent()[0], $( "#wrap1" )[0], "overlay modified after init" );
element.dialog( "destroy" );
element.dialog({
appendTo: detached,
modal: true
}); });
equal( element.dialog( "widget" ).parent()[0], detached[0], "detached jQuery object" ); equal( element.dialog( "widget" ).parent()[0], detached[0], "detached jQuery object" );
equal( detached.find( ".ui-widget-overlay" ).parent()[0], detached[0], "overlay detached jQuery object" );
element.dialog( "destroy" ); element.dialog( "destroy" );
element.dialog({ element.dialog({
appendTo: detached[0] appendTo: detached[0],
modal: true
}); });
equal( element.dialog( "widget" ).parent()[0], detached[0], "detached DOM element" ); equal( element.dialog( "widget" ).parent()[0], detached[0], "detached DOM element" );
equal( detached.find( ".ui-widget-overlay" ).parent()[0], detached[0], "overlay detached DOM element" );
element.dialog( "destroy" ); element.dialog( "destroy" );
element.dialog({ autoOpen: false }).dialog( "option", "appendTo", detached ); element.dialog({
autoOpen: false,
modal: true
}).dialog( "option", "appendTo", detached );
equal( element.dialog( "widget" ).parent()[0], detached[0], "detached DOM element via option()" ); equal( element.dialog( "widget" ).parent()[0], detached[0], "detached DOM element via option()" );
equal( detached.find( ".ui-widget-overlay" ).length, 0, "overlay detached DOM element via option()" );
element.dialog( "destroy" ); element.dialog( "destroy" );
}); });

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

@ -695,7 +695,7 @@ $.widget( "ui.dialog", {
this.overlay = $("<div>") this.overlay = $("<div>")
.addClass("ui-widget-overlay ui-front") .addClass("ui-widget-overlay ui-front")
.appendTo( this.document[0].body ); .appendTo( this._appendTo() );
this._on( this.overlay, { this._on( this.overlay, {
mousedown: "_keepFocus" mousedown: "_keepFocus"
}); });