Permalink
Browse files

Dialog: Don't hide the dialog in _size if it started visible. Fixes #…

…6717 - Dialog: Adding a button makes the dialog disappear in IE6.
  • Loading branch information...
1 parent e01664a commit b9e34f726a89fc9edb3b05d4a53b8081c6c6d80f @scottgonzalez scottgonzalez committed Dec 3, 2010
Showing with 5 additions and 2 deletions.
  1. +5 −2 ui/jquery.ui.dialog.js
@@ -633,7 +633,8 @@ $.widget("ui.dialog", {
*/
var options = this.options,
nonContentHeight,
- minContentHeight;
+ minContentHeight,
+ isVisible = this.uiDialog.is( ":visible" );
// reset content sizing
this.element.show().css({
@@ -665,7 +666,9 @@ $.widget("ui.dialog", {
} else {
this.uiDialog.show();
var autoHeight = this.element.css( "height", "auto" ).height();
- this.uiDialog.hide();
+ if ( !isVisible ) {
+ this.uiDialog.hide();
+ }
this.element.height( Math.max( autoHeight, minContentHeight ) );
}
} else {

0 comments on commit b9e34f7

Please sign in to comment.