diff options
| author | Dan Wellman <danwellman@hotmail.com> | 2011-12-01 15:56:36 +0000 |
|---|---|---|
| committer | Dan Wellman <danwellman@hotmail.com> | 2011-12-01 15:56:36 +0000 |
| commit | 041de0716c6c3e81fe4f9f5d1a9c9c4447d8710a (patch) | |
| tree | 00f5de162b9f57c5bf8f4660e9d94d20fc40f2ea /ui/jquery.ui.dialog.js | |
| parent | 7d5238ad632d16da2b1e5c2af289c1a3381f5dd0 (diff) | |
| parent | b539e2e5c8528fb1cfaa241fd509fc1ccf65a095 (diff) | |
| download | jquery-ui-041de0716c6c3e81fe4f9f5d1a9c9c4447d8710a.tar.gz jquery-ui-041de0716c6c3e81fe4f9f5d1a9c9c4447d8710a.zip | |
Merge branch 'selectmenu' of git://github.com/jquery/jquery-ui 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" ) { |