aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorJames Khoury <james@jameskhoury.com>2011-11-28 16:52:10 -0500
committerScott González <scott.gonzalez@gmail.com>2011-11-28 16:52:10 -0500
commitce0afde900fb2b55b5766a3e0e3029e24a094a75 (patch)
treec272d29be8149417c870e8a3c0196805e5f66df6 /ui
parent06f6fa8524a905ec8027b8ba756eb199f2591336 (diff)
downloadjquery-ui-ce0afde900fb2b55b5766a3e0e3029e24a094a75.tar.gz
jquery-ui-ce0afde900fb2b55b5766a3e0e3029e24a094a75.zip
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.
Diffstat (limited to 'ui')
-rw-r--r--ui/jquery.ui.dialog.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index 49ef8f64b..3d7638667 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -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" ) {