mirror of
https://github.com/jquery/jquery-ui.git
synced 2024-11-21 11:04:24 +00:00
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:
parent
e01664a382
commit
b9e34f726a
7
ui/jquery.ui.dialog.js
vendored
7
ui/jquery.ui.dialog.js
vendored
@ -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 {
|
||||||
|
Loading…
Reference in New Issue
Block a user