diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2010-12-03 08:31:06 -0500 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2010-12-03 08:31:06 -0500 |
| commit | b9e34f726a89fc9edb3b05d4a53b8081c6c6d80f (patch) | |
| tree | 49bf13c4f76633278f81dc38bdf4880308bb1ac9 | |
| parent | e01664a3820c185636a3fe7099e93e68091d24fd (diff) | |
| download | jquery-ui-b9e34f726a89fc9edb3b05d4a53b8081c6c6d80f.tar.gz jquery-ui-b9e34f726a89fc9edb3b05d4a53b8081c6c6d80f.zip | |
Dialog: Don't hide the dialog in _size if it started visible. Fixes #6717 - Dialog: Adding a button makes the dialog disappear in IE6.
| -rw-r--r-- | ui/jquery.ui.dialog.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js index c2d5d3e16..81df1d19b 100644 --- a/ui/jquery.ui.dialog.js +++ b/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 { |