aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.ui.dialog.js
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2010-03-25 21:58:08 -0400
committerScott González <scott.gonzalez@gmail.com>2010-03-25 21:58:08 -0400
commitb297b3fa6a1e4b6cba735a10ca03a6175f8eda3a (patch)
tree03195c8714715499ae93603aa653bcf5717f7fd3 /ui/jquery.ui.dialog.js
parent9786a19c82a8eb50f470d0e2a92126b65e4e8fd9 (diff)
downloadjquery-ui-b297b3fa6a1e4b6cba735a10ca03a6175f8eda3a.tar.gz
jquery-ui-b297b3fa6a1e4b6cba735a10ca03a6175f8eda3a.zip
Fixed size calculations for dialogs.
Fixes #5392 - Dialog explicit height doesn't match given value from set option.
Diffstat (limited to 'ui/jquery.ui.dialog.js')
-rw-r--r--ui/jquery.ui.dialog.js7
1 files changed, 5 insertions, 2 deletions
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index 4e164dbe8..6e538b6e5 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -622,8 +622,11 @@ $.widget("ui.dialog", {
// reset content sizing
// hide for non content measurement because height: 0 doesn't work in IE quirks mode (see #4350)
- this.element.css('width', 'auto')
- .height(0);
+ this.element.css({
+ width: 'auto',
+ minHeight: 0,
+ height: 0
+ });
// reset wrapper sizing
// determine the height of all the non-content elements