library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2025-01-07 20:34:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Dialog: Removed minHeight workaround for IE6.

Browse Source
This commit is contained in:
Scott González 2012-10-26 14:36:35 -04:00
parent da1255a392
commit 5bd4b11d9b
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ui/jquery.ui.dialog.js vendored
View File

@ -586,9 +586,8 @@ $.widget("ui.dialog", {
/* If the user has resized the dialog, the .ui-dialog and .ui-dialog-content /* If the user has resized the dialog, the .ui-dialog and .ui-dialog-content
* divs will both have width and height set, so we need to reset them * divs will both have width and height set, so we need to reset them
*/ */
var nonContentHeight, minContentHeight, autoHeight, var nonContentHeight, minContentHeight,
options = this.options, options = this.options;
isVisible = this.uiDialog.is( ":visible" );
// reset content sizing // reset content sizing
this.element.show().css({ this.element.show().css({
@ -611,20 +610,10 @@ $.widget("ui.dialog", {
minContentHeight = Math.max( 0, options.minHeight - nonContentHeight ); minContentHeight = Math.max( 0, options.minHeight - nonContentHeight );
if ( options.height === "auto" ) { if ( options.height === "auto" ) {
// only needed for IE6 support this.element.css({
if ( $.support.minHeight ) { minHeight: minContentHeight,
this.element.css({ height: "auto"
minHeight: minContentHeight, });
height: "auto"
});
} else {
this.uiDialog.show();
autoHeight = this.element.css( "height", "auto" ).height();
if ( !isVisible ) {
this.uiDialog.hide();
}
this.element.height( Math.max( autoHeight, minContentHeight ) );
}
} else { } else {
this.element.height( Math.max( options.height - nonContentHeight, 0 ) ); this.element.height( Math.max( options.height - nonContentHeight, 0 ) );
} }