Skip to content
Permalink
Browse files

Dialog: Use _show and _hide consistently. Fixes #4892 - Dialog: zInde…

…x error with animated modal dialog.
  • Loading branch information...
jzaefferer committed Oct 23, 2012
1 parent 513b6da commit d07074dc3c3b2c73ccf1ed1cb2876df31154e039
Showing with 12 additions and 15 deletions.
  1. +8 −5 demos/dialog/animated.html
  2. +4 −10 ui/jquery.ui.dialog.js
@@ -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>
@@ -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

0 comments on commit d07074d

Please sign in to comment.
You can’t perform that action at this time.