Skip to content

Commit

Permalink
Tabs: Removed overflow workaround for IE6.
Browse files Browse the repository at this point in the history
  • Loading branch information
scottgonzalez committed Oct 26, 2012
1 parent 1722749 commit da1255a
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions ui/jquery.ui.tabs.js
Expand Up @@ -487,18 +487,10 @@ $.widget( "ui.tabs", {
}, },


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


if ( heightStyle === "fill" ) { 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(); maxHeight = parent.height();
this.element.siblings( ":visible" ).each(function() { this.element.siblings( ":visible" ).each(function() {
var elem = $( this ), var elem = $( this ),
Expand All @@ -509,9 +501,6 @@ $.widget( "ui.tabs", {
} }
maxHeight -= elem.outerHeight( true ); maxHeight -= elem.outerHeight( true );
}); });
if ( overflow ) {
parent.css( "overflow", overflow );
}


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

0 comments on commit da1255a

Please sign in to comment.