Showing with 8 additions and 42 deletions.
  1. +1 −13 ui/jquery.ui.accordion.js
  2. +6 −17 ui/jquery.ui.dialog.js
  3. +1 −12 ui/jquery.ui.tabs.js
@@ -283,20 +283,11 @@ $.widget( "ui.accordion", {
},

refresh: function() {
var maxHeight, overflow,
var maxHeight,
heightStyle = this.options.heightStyle,
parent = this.element.parent();


if ( heightStyle === "fill" ) {
// IE 6 treats height like minHeight, so we need to turn off overflow
// in order to get a reliable height
// we use the minHeight support test because we assume that only
// browsers that don't support minHeight will treat height as minHeight
if ( !$.support.minHeight ) {
overflow = parent.css( "overflow" );
parent.css( "overflow", "hidden");
}
maxHeight = parent.height();
this.element.siblings( ":visible" ).each(function() {
var elem = $( this ),
@@ -307,9 +298,6 @@ $.widget( "ui.accordion", {
}
maxHeight -= elem.outerHeight( true );
});
if ( overflow ) {
parent.css( "overflow", overflow );
}

this.headers.each(function() {
maxHeight -= $( this ).outerHeight( true );
@@ -586,9 +586,8 @@ $.widget("ui.dialog", {
/* If the user has resized the dialog, the .ui-dialog and .ui-dialog-content
* divs will both have width and height set, so we need to reset them
*/
var nonContentHeight, minContentHeight, autoHeight,
options = this.options,
isVisible = this.uiDialog.is( ":visible" );
var nonContentHeight, minContentHeight,
options = this.options;

// reset content sizing
this.element.show().css({
@@ -611,20 +610,10 @@ $.widget("ui.dialog", {
minContentHeight = Math.max( 0, options.minHeight - nonContentHeight );

if ( options.height === "auto" ) {
// only needed for IE6 support
if ( $.support.minHeight ) {
this.element.css({
minHeight: minContentHeight,
height: "auto"
});
} else {
this.uiDialog.show();
autoHeight = this.element.css( "height", "auto" ).height();
if ( !isVisible ) {
this.uiDialog.hide();
}
this.element.height( Math.max( autoHeight, minContentHeight ) );
}
this.element.css({
minHeight: minContentHeight,
height: "auto"
});
} else {
this.element.height( Math.max( options.height - nonContentHeight, 0 ) );
}
@@ -487,18 +487,10 @@ $.widget( "ui.tabs", {
},

_setupHeightStyle: function( heightStyle ) {
var maxHeight, overflow,
var maxHeight,
parent = this.element.parent();

if ( heightStyle === "fill" ) {
// IE 6 treats height like minHeight, so we need to turn off overflow
// in order to get a reliable height
// we use the minHeight support test because we assume that only
// browsers that don't support minHeight will treat height as minHeight
if ( !$.support.minHeight ) {
overflow = parent.css( "overflow" );
parent.css( "overflow", "hidden");
}
maxHeight = parent.height();
this.element.siblings( ":visible" ).each(function() {
var elem = $( this ),
@@ -509,9 +501,6 @@ $.widget( "ui.tabs", {
}
maxHeight -= elem.outerHeight( true );
});
if ( overflow ) {
parent.css( "overflow", overflow );
}

this.element.children().not( this.panels ).each(function() {
maxHeight -= $( this ).outerHeight( true );