library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2024-10-05 01:44:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Dialog: Use _show and _hide consistently. Fixes #4892 - Dialog: zIndex error with animated modal dialog.

Browse Source
This commit is contained in:
Jörn Zaefferer 2012-10-23 11:09:04 -04:00
parent 513b6da641
commit d07074dc3c
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
demos/dialog/animated.html
View File

@ -18,18 +18,21 @@
<script src="../../ui/jquery.ui.effect-explode.js"></script>
<link rel="stylesheet" href="../demos.css">
<script>
// increase the default animation speed to exaggerate the effect
$.fx.speeds._default = 1000;
$(function() {
$( "#dialog" ).dialog({
autoOpen: false,
show: "blind",
hide: "explode"
show: {
effect: "blind",
duration: 1000
},
hide: {
effect: "explode",
duration: 1000
}
});
$( "#opener" ).click(function() {
$( "#dialog" ).dialog( "open" );
return false;
});
});
</script>

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

@ -255,14 +255,9 @@ $.widget("ui.dialog", {
$( this.document[ 0 ].activeElement ).blur();
}
if ( this.options.hide ) {
this._hide( this.uiDialog, this.options.hide, function() {
that._trigger( "close", event );
});
} else {
this.uiDialog.hide();
this._trigger( "close", event );
}
this._hide( this.uiDialog, this.options.hide, function() {
that._trigger( "close", event );
});
},
isOpen: function() {
@ -289,10 +284,9 @@ $.widget("ui.dialog", {
this._size();
this._position( options.position );
uiDialog.show( options.show );
this.overlay = options.modal ? new $.ui.dialog.overlay( this ) : null;
this.moveToTop( null, true );
this._show( uiDialog, options.show );
// set focus to the first tabbable element in the content area or the first button
// if there are no tabbable elements, set focus on the dialog itself