diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2010-09-07 09:33:09 -0400 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2010-09-07 09:33:09 -0400 |
| commit | 52e543a63760d9e9ca17e04e796ca80646326f4a (patch) | |
| tree | fafa90091c64d81a09984de2412c32fbf2dcd9fa /ui/jquery.ui.dialog.js | |
| parent | 99694e6fec88c0fbb10144f856073f01cd44091f (diff) | |
| download | jquery-ui-52e543a63760d9e9ca17e04e796ca80646326f4a.tar.gz jquery-ui-52e543a63760d9e9ca17e04e796ca80646326f4a.zip | |
Dialog: If the browser doesn't support minHeight, use height to set the minHeight. Fixes #6027 - Dialog: minHeight isn't properly handled on init in IE6.
Diffstat (limited to 'ui/jquery.ui.dialog.js')
| -rw-r--r-- | ui/jquery.ui.dialog.js | 3 |
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) |