aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2012-10-26 14:36:35 -0400
committerScott González <scott.gonzalez@gmail.com>2012-10-26 14:36:35 -0400
commit5bd4b11d9ba8c8cfd51f2d31ca56357191631d24 (patch)
tree6a44e05059d4a5b1b5a3e8d28940f3f31df5e527 /ui
parentda1255a392a0132711dacce7283df221621f098b (diff)
downloadjquery-ui-5bd4b11d9ba8c8cfd51f2d31ca56357191631d24.tar.gz
jquery-ui-5bd4b11d9ba8c8cfd51f2d31ca56357191631d24.zip
Dialog: Removed minHeight workaround for IE6.
Diffstat (limited to 'ui')
-rw-r--r--ui/jquery.ui.dialog.js23
1 files changed, 6 insertions, 17 deletions
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index e96802e96..08f84e192 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -586,9 +586,8 @@ $.widget("ui.dialog", {
/* 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
*/
- var nonContentHeight, minContentHeight, autoHeight,
- options = this.options,
- isVisible = this.uiDialog.is( ":visible" );
+ var nonContentHeight, minContentHeight,
+ options = this.options;
// reset content sizing
this.element.show().css({
@@ -611,20 +610,10 @@ $.widget("ui.dialog", {
minContentHeight = Math.max( 0, options.minHeight - nonContentHeight );
if ( options.height === "auto" ) {
- // only needed for IE6 support
- if ( $.support.minHeight ) {
- this.element.css({
- 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 ) );
- }
+ this.element.css({
+ minHeight: minContentHeight,
+ height: "auto"
+ });
} else {
this.element.height( Math.max( options.height - nonContentHeight, 0 ) );
}