Skip to content
Permalink
Browse files

Dialog: Modified the dialog._size() to use outerHeight in calculating…

… the nonContentHeight. Fixed #7692 - dialog: dialog height bug is incorrect when .ui-dialog padding set.
  • Loading branch information
JamesKhoury authored and scottgonzalez committed Nov 28, 2011
1 parent 06f6fa8 commit ce0afde900fb2b55b5766a3e0e3029e24a094a75
Showing with 10 additions and 5 deletions.
  1. +9 −4 tests/unit/dialog/dialog_options.js
  2. +1 −1 ui/jquery.ui.dialog.js
@@ -177,19 +177,24 @@ test("draggable", function() {
});

test("height", function() {
expect(3);
expect(4);

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

el = $('<div></div>').dialog({ height: 237 });
equals(dlg().height(), 237, "explicit height");
equals(dlg().outerHeight(), 237, "explicit height");
el.remove();

el = $('<div></div>').dialog();
el.dialog('option', 'height', 238);
equals(dlg().height(), 238, "explicit height set after init");
equals(dlg().outerHeight(), 238, "explicit height set after init");
el.remove();

el = $('<div></div>').css("padding", "20px")
.dialog({ height: 240 });
equals(dlg().outerHeight(), 240, "explicit height with padding");
el.remove();
});

@@ -625,7 +625,7 @@ $.widget("ui.dialog", {
height: "auto",
width: options.width
})
.height();
.outerHeight();
minContentHeight = Math.max( 0, options.minHeight - nonContentHeight );

if ( options.height === "auto" ) {

3 comments on commit ce0afde

@scottgonzalez

This comment has been minimized.

Copy link
Member

scottgonzalez replied Dec 10, 2013

@JamesKhoury Can you please sign our CLA?

@JamesKhoury

This comment has been minimized.

Copy link
Contributor Author

JamesKhoury replied Dec 11, 2013

👍

@scottgonzalez

This comment has been minimized.

Copy link
Member

scottgonzalez replied Dec 12, 2013

Thanks.

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