summaryrefslogtreecommitdiffstats
path: root/ui/ui.dialog.js
diff options
context:
space:
mode:
Diffstat (limited to 'ui/ui.dialog.js')
-rw-r--r--ui/ui.dialog.js15
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: {},