]> source.dussan.org Git - jquery-ui.git/commitdiff
Dialog: If the browser doesn't support minHeight, use height to set the minHeight...
authorScott González <scott.gonzalez@gmail.com>
Tue, 7 Sep 2010 13:33:09 +0000 (09:33 -0400)
committerScott González <scott.gonzalez@gmail.com>
Tue, 7 Sep 2010 13:33:09 +0000 (09:33 -0400)
ui/jquery.ui.dialog.js

index a1c911b8e903631fdfea841469544f74178a6842..c7ef437fc75b4b6af376d12e57d584cc69f807bd 100644 (file)
@@ -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)