aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ui/jquery.ui.dialog.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index a1c911b8e..c7ef437fc 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -649,7 +649,8 @@ $.widget("ui.dialog", {
this.element
.css(options.height === 'auto' ? {
minHeight: Math.max(options.minHeight - nonContentHeight, 0),
- height: 'auto'
+ height: $.support.minHeight ? 'auto' :
+ Math.max(options.minHeight - nonContentHeight, 0)
} : {
minHeight: 0,
height: Math.max(options.height - nonContentHeight, 0)