Skip to content
Permalink
Browse files

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.
  • Loading branch information
scottgonzalez committed Dec 31, 2008
1 parent 95441ed commit 2789fca8afb34dc770df8163fad7f6df15a77025
Showing with 12 additions and 9 deletions.
  1. +3 −3 tests/dialog.js
  2. +9 −6 ui/ui.dialog.js
@@ -14,10 +14,10 @@ var defaults = {
disabled: false,
dialogClass: undefined,
draggable: true,
height: 200,
height: 'auto',
maxHeight: undefined,
maxWidth: undefined,
minHeight: 100,
minHeight: 150,
minWidth: 150,
modal: false,
overlay: {},
@@ -365,7 +365,7 @@ test("height", function() {
expect(3);

el = $('<div></div>').dialog();
equals(dlg().height(), defaults.height, "default height");
equals(dlg().height(), defaults.minHeight, "default height");
el.remove();

el = $('<div></div>').dialog({ height: 437 });
@@ -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: {},

0 comments on commit 2789fca

Please sign in to comment.
You can’t perform that action at this time.