Dialog: Don't hide the dialog in _size if it started visible. Fixes #6717 - Dialog: Adding a button makes the dialog disappear in IE6.

This commit is contained in:
Scott González 2010-12-03 08:31:06 -05:00
parent e01664a382
commit b9e34f726a

View File

@ -633,7 +633,8 @@ $.widget("ui.dialog", {
*/ */
var options = this.options, var options = this.options,
nonContentHeight, nonContentHeight,
minContentHeight; minContentHeight,
isVisible = this.uiDialog.is( ":visible" );
// reset content sizing // reset content sizing
this.element.show().css({ this.element.show().css({
@ -665,7 +666,9 @@ $.widget("ui.dialog", {
} else { } else {
this.uiDialog.show(); this.uiDialog.show();
var autoHeight = this.element.css( "height", "auto" ).height(); var autoHeight = this.element.css( "height", "auto" ).height();
this.uiDialog.hide(); if ( !isVisible ) {
this.uiDialog.hide();
}
this.element.height( Math.max( autoHeight, minContentHeight ) ); this.element.height( Math.max( autoHeight, minContentHeight ) );
} }
} else { } else {