diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2008-12-31 01:12:43 +0000 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2008-12-31 01:12:43 +0000 |
| commit | 2789fca8afb34dc770df8163fad7f6df15a77025 (patch) | |
| tree | 796d6b64ba9a63f2d83b5f8592f09083e6ca840f /ui | |
| parent | 95441ed80f25feb9b3f25f29eaf68022ba255007 (diff) | |
| download | jquery-ui-2789fca8afb34dc770df8163fad7f6df15a77025.tar.gz jquery-ui-2789fca8afb34dc770df8163fad7f6df15a77025.zip | |
Dialog: Fixed #3713: Set default height to auto and default minHeight to 150. Now applying minHeight to the content div instead of only using it for resizing.
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/ui.dialog.js | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/ui/ui.dialog.js b/ui/ui.dialog.js index 2cb4d4447..824f8d29f 100644 --- a/ui/ui.dialog.js +++ b/ui/ui.dialog.js @@ -448,10 +448,13 @@ $.widget("ui.dialog", { }) .height(); - this.element.height( - options.height == 'auto' - ? 'auto' - : options.height - nonContentHeight); + this.element + .css({ + minHeight: options.minHeight - nonContentHeight, + height: options.height == 'auto' + ? 'auto' + : options.height - nonContentHeight + }); } }); @@ -464,8 +467,8 @@ $.extend($.ui.dialog, { closeOnEscape: true, closeText: 'close', draggable: true, - height: 200, - minHeight: 100, + height: 'auto', + minHeight: 150, minWidth: 150, modal: false, overlay: {}, |