diff options
| author | maggiewachs <maggie@filamentgroup.com> | 2010-04-16 14:24:49 -0400 |
|---|---|---|
| committer | maggiewachs <maggie@filamentgroup.com> | 2010-04-16 14:24:49 -0400 |
| commit | 970ed9a67a533ab44b184babf52100dfbcfa7c96 (patch) | |
| tree | 423aa90362d991c62af87ec7b1a094706f46cdcd /ui/jquery.ui.dialog.js | |
| parent | 4ffe07457cb21332e9a33c319c1f1f610e532a27 (diff) | |
| parent | d1033cc2b79067f31767bfe0bb1f9a761dae9b3f (diff) | |
| download | jquery-ui-970ed9a67a533ab44b184babf52100dfbcfa7c96.tar.gz jquery-ui-970ed9a67a533ab44b184babf52100dfbcfa7c96.zip | |
Merge branch 'master' of github.com:jquery/jquery-ui
Diffstat (limited to 'ui/jquery.ui.dialog.js')
| -rw-r--r-- | ui/jquery.ui.dialog.js | 7 |
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 |