diff options
| author | kborchers <k_borchers@yahoo.com> | 2011-11-30 10:46:31 -0600 |
|---|---|---|
| committer | kborchers <k_borchers@yahoo.com> | 2011-11-30 10:49:13 -0600 |
| commit | b539e2e5c8528fb1cfaa241fd509fc1ccf65a095 (patch) | |
| tree | 6c4ef7aed8fbaaaaff4ea2e961d7db5428fce7bb /ui/jquery.ui.dialog.js | |
| parent | 53ea93327e9040b7472e8fd2af2abaea19058e4a (diff) | |
| parent | afdc577e9c26d6571e934a8fef892f7fbe3619c6 (diff) | |
| download | jquery-ui-b539e2e5c8528fb1cfaa241fd509fc1ccf65a095.tar.gz jquery-ui-b539e2e5c8528fb1cfaa241fd509fc1ccf65a095.zip | |
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.dialog.js')
| -rw-r--r-- | ui/jquery.ui.dialog.js | 2 |
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" ) { |