aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.ui.dialog.js
diff options
context:
space:
mode:
authorBrant Burnett <btburnett3@gmail.com>2010-02-22 17:37:08 +0000
committerBrant Burnett <btburnett3@gmail.com>2010-02-22 17:37:08 +0000
commite2202847c6a8837bb732cc21401915b82e433c50 (patch)
tree8938e80c15a884de773d05435c0e32c1899fc886 /ui/jquery.ui.dialog.js
parenta8747488d0e78400f3a038b8777ade867f678984 (diff)
downloadjquery-ui-e2202847c6a8837bb732cc21401915b82e433c50.tar.gz
jquery-ui-e2202847c6a8837bb732cc21401915b82e433c50.zip
Dialog: Changed height measurement to hide content because IE quirks mode ignores height: 0 (Fixed #4350 No Scrollbars in IE in Quirksmode)
Diffstat (limited to 'ui/jquery.ui.dialog.js')
-rw-r--r--ui/jquery.ui.dialog.js14
1 files changed, 7 insertions, 7 deletions
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index 167ffaca7..6d13935de 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -547,11 +547,9 @@ $.widget("ui.dialog", {
var options = this.options;
// reset content sizing
- this.element.css({
- height: 0,
- minHeight: 0,
- width: 'auto'
- });
+ // hide for non content measurement because height: 0 doesn't work in IE quirks mode (see #4350)
+ this.element.css('width', 'auto')
+ .hide();
// reset wrapper sizing
// determine the height of all the non-content elements
@@ -567,8 +565,10 @@ $.widget("ui.dialog", {
height: 'auto'
}
: {
- height: Math.max(options.height - nonContentHeight, 0)
- });
+ minHeight: 0,
+ height: Math.max(options.height - nonContentHeight, 0)
+ })
+ .show();
(this.uiDialog.is(':data(resizable)') &&
this.uiDialog.resizable('option', 'minHeight', this._minHeight()));