Skip to content
Permalink
Browse files

IE6 will shrink-wrap elements with layout instead of allowing content…

… to flow outside of the border-box. Add a test for this and do not remove the overflow property after an animation in IE6.
  • Loading branch information...
csnover committed Oct 5, 2010
1 parent 329b750 commit 5057ff9f43017f673894584358ca95c8753b65d4
Showing with 162 additions and 101 deletions.
  1. +20 −13 src/effects.js
  2. +36 −21 src/support.js
  3. +21 −21 test/index.html
  4. +85 −46 test/unit/effects.js
@@ -36,17 +36,23 @@ jQuery.fn.extend({
return this.animate( genFx("show", 3), speed, easing, callback);
} else {
for ( var i = 0, j = this.length; i < j; i++ ) {
// Reset the inline display of this element to learn if it is
// being hidden by cascaded rules or not
if ( !jQuery.data(this[i], "olddisplay") && this[i].style.display === "none" ) {
this[i].style.display = "";
}

// Set elements which have been overridden with display: none
// in a stylesheet to whatever the default browser style is
// for such an element
if ( jQuery.css( this[i], "display" ) === "none" && this[i].style.display !== "none" ) {
if ( jQuery.css( this[i], "display" ) === "none" && this[i].style.display === "" ) {
jQuery.data(this[i], "olddisplay", defaultDisplay(this[i].nodeName));
}
}

// Set the display of the elements in a second loop
// Set the display of most of the elements in a second loop
// to avoid the constant reflow
for ( i = 0, j = this.length; i < j; i++ ) {
for ( i = 0; i < j; i++ ) {
this[i].style.display = jQuery.data(this[i], "olddisplay") || "";
}

@@ -59,17 +65,17 @@ jQuery.fn.extend({
return this.animate( genFx("hide", 3), speed, easing, callback);

} else {
for ( var i = 0, l = this.length; i < l; i++ ) {
for ( var i = 0, j = this.length; i < j; i++ ) {
var old = jQuery.data(this[i], "olddisplay");
if ( !old && old !== "none" ) {
if ( !old ) {
jQuery.data( this[i], "olddisplay", jQuery.css( this[i], "display" ) );
}
}

// Set the display of the elements in a second loop
// to avoid the constant reflow
for ( var j = 0, k = this.length; j < k; j++ ) {
this[j].style.display = "none";
for ( i = 0; i < j; i++ ) {
this[i].style.display = "none";
}

return this;
@@ -115,7 +121,8 @@ jQuery.fn.extend({
// test suite

var opt = jQuery.extend({}, optall), p,
hidden = this.nodeType === 1 && jQuery(this).is(":hidden"),
isElement = this.nodeType === 1,
hidden = isElement && jQuery(this).is(":hidden"),
self = this;

for ( p in prop ) {
@@ -131,7 +138,7 @@ jQuery.fn.extend({
return opt.complete.call(this);
}

if ( ( p === "height" || p === "width" ) ) {
if ( isElement && ( p === "height" || p === "width" ) ) {
// Make sure that nothing sneaks out
// Record all 3 overflow attributes because IE does not
// change the overflow attribute when overflowX and
@@ -141,8 +148,8 @@ jQuery.fn.extend({
// Set display property to inline-block for height/width
// animations on inline elements that are having width/height
// animated
if ( jQuery.curCSS( this, "display" ) === "inline" &&
jQuery.curCSS( this, "float" ) === "none" ) {
if ( jQuery.css( this, "display" ) === "inline" &&
jQuery.css( this, "float" ) === "none" ) {
if ( !jQuery.support.inlineBlockNeedsLayout ) {
this.style.display = "inline-block";
} else {
@@ -168,7 +175,7 @@ jQuery.fn.extend({
}
}

if ( opt.overflow != null ) {
if ( opt.overflow != null || (jQuery.support.shrinkWrapBlocks && isElement) ) {
this.style.overflow = "hidden";
}

@@ -401,7 +408,7 @@ jQuery.fx.prototype = {

if ( done ) {
// Reset the overflow
if ( this.options.overflow != null ) {
if ( this.options.overflow != null && (!jQuery.support.shrinkWrapBlocks || !jQuery.css( this.elem, "hasLayout" )) ) {
this.elem.style.overflow = this.options.overflow[0];
this.elem.style.overflowX = this.options.overflow[1];
this.elem.style.overflowY = this.options.overflow[2];
@@ -67,6 +67,7 @@
noCloneEvent: true,
boxModel: null,
inlineBlockNeedsLayout: false,
shrinkWrapBlocks: false,
reliableHiddenOffsets: true
};

@@ -120,48 +121,62 @@
document.body.appendChild( div );
jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2;

// Check if natively block-level elements act like inline-block
// elements when setting their display to 'inline'
// (IE < 8 does this)
if ( 'zoom' in div.style ) {
// Check if natively block-level elements act like inline-block
// elements when setting their display to 'inline' and giving
// them layout
// (IE < 8 does this)
div.style.display = 'inline';

// Layout is necessary to trigger this “feature”
div.style.zoom = 1;
jQuery.support.inlineBlockNeedsLayout = div.offsetWidth === 2;

// Check if elements with layout shrink-wrap their children
// (IE 6 does this)
div.style.display = '';
div.innerHTML = '<div style="width:4px;"></div>';
jQuery.support.shrinkWrapBlocks = div.offsetWidth !== 2;
}

div.innerHTML = '<table><tr><td style="padding:0;display:none"></td><td>t</td></tr></table>';
var tds = div.getElementsByTagName('td');

// Check if table cells still have offsetWidth/Height when they are set
// to display:none and there are still other visible table cells in a
// table row; if so, offsetWidth/Height are not reliable for use when
// determining if an element has been hidden directly using
// display:none (it is still safe to use offsets if a parent element is
// hidden; don safety goggles and see bug #4512 for more information).
// (only IE 8 fails this test)
div.innerHTML = '<table><tr><td style="display:none"></td><td>t</td></tr></table>';
jQuery.support.reliableHiddenOffsets = div.getElementsByTagName('td')[0].offsetHeight === 0;
jQuery.support.reliableHiddenOffsets = tds[0].offsetHeight === 0;

tds[0].style.display = '';
tds[1].style.display = 'none';

// Check if empty table cells still have offsetWidth/Height
// (IE < 8 fail this test)
jQuery.support.reliableHiddenOffsets = jQuery.support.reliableHiddenOffsets && tds[0].offsetHeight === 0;
div.innerHTML = '';

document.body.removeChild( div ).style.display = 'none';
div = null;
div = tds = null;
});

// Technique from Juriy Zaytsev
// http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/
var eventSupported = function( eventName ) {
var el = document.createElement("div");
eventName = "on" + eventName;

var isSupported = (eventName in el);
if ( !isSupported ) {
el.setAttribute(eventName, "return;");
isSupported = typeof el[eventName] === "function";
}
el = null;

return isSupported;
var eventSupported = function( eventName ) {
var el = document.createElement("div");
eventName = "on" + eventName;

var isSupported = (eventName in el);
if ( !isSupported ) {
el.setAttribute(eventName, "return;");
isSupported = typeof el[eventName] === "function";
}
el = null;

return isSupported;
};

jQuery.support.submitBubbles = eventSupported("submit");
jQuery.support.changeBubbles = eventSupported("change");

@@ -48,7 +48,7 @@ <h2 id="qunit-banner"></h2>
<div id="qunit-testrunner-toolbar"></div>
<h2 id="qunit-userAgent"></h2>
<ol id="qunit-tests"></ol>

<!-- Test HTML -->
<div id="nothiddendiv" style="height:1px;background:white;" class="nothiddendiv">
<div id="nothiddendivchild"></div>
@@ -59,9 +59,9 @@ <h2 id="qunit-userAgent"></h2>
<div id="main">
<p id="firstp">See <a id="simon1" href="http://simon.incutio.com/archive/2003/03/25/#getElementsBySelector" rel="bookmark">this blog entry</a> for more information.</p>
<p id="ap">
Here are some links in a normal paragraph: <a id="google" href="http://www.google.com/" title="Google!">Google</a>,
<a id="groups" href="http://groups.google.com/" class="GROUPS">Google Groups (Link)</a>.
This link has <code><a href="http://smin" id="anchor1">class="blog"</a></code>:
Here are some links in a normal paragraph: <a id="google" href="http://www.google.com/" title="Google!">Google</a>,
<a id="groups" href="http://groups.google.com/" class="GROUPS">Google Groups (Link)</a>.
This link has <code><a href="http://smin" id="anchor1">class="blog"</a></code>:
<a href="http://diveintomark.org/" class="blog" hreflang="en" id="mark">diveintomark</a>

</p>
@@ -87,14 +87,14 @@ <h2 id="qunit-userAgent"></h2>

<input type="hidden" name="hidden" id="hidden1"/>
<input type="text" style="display:none;" name="foo[bar]" id="hidden2"/>

<input type="text" id="name" name="name" value="name" />
<input type="search" id="search" name="search" value="search" />

<button id="button" name="button" type="button">Button</button>

<textarea id="area1" maxlength="30">foobar</textarea>

<select name="select1" id="select1">
<option id="option1a" class="emptyopt" value="">Nothing</option>
<option id="option1b" value="1">1</option>
@@ -128,19 +128,19 @@ <h2 id="qunit-userAgent"></h2>
<option id="option5b" value="2">2</option>
<option id="option5c" value="1">3</option>
</select>

<object id="object1" codebase="stupid">
<param name="p1" value="x1" />
<param name="p2" value="x2" />
</object>

<span id="台北Táiběi"></span>
<span id="台北" lang="中文"></span>
<span id="utf8class1" class="台北Táiběi 台北"></span>
<span id="utf8class2" class="台北"></span>
<span id="foo:bar" class="foo:bar"></span>
<span id="test.foo[5]bar" class="test.foo[5]bar"></span>

<foo_bar id="foobar">test element</foo_bar>
</form>
<b id="floatTest">Float test.</b>
@@ -157,7 +157,7 @@ <h2 id="qunit-userAgent"></h2>
<input name="types[]" id="types_anime" type="checkbox" value="anime" />
<input name="types[]" id="types_movie" type="checkbox" value="movie" />
</form>

<form id="testForm" action="#" method="get">
<textarea name="T3" rows="2" cols="15">?
Z</textarea>
@@ -213,15 +213,15 @@ <h2 id="qunit-userAgent"></h2>
<div><div class="hidden">hidden</div></div>
</div>
</div>

<div id="tabindex-tests">
<ol id="listWithTabIndex" tabindex="5">
<li id="foodWithNegativeTabIndex" tabindex="-1">Rice</li>
<li id="foodNoTabIndex">Beans</li>
<li>Blinis</li>
<li>Tofu</li>
</ol>

<div id="divWithNoTabIndex">I'm hungry. I should...</div>
<span>...</span><a href="#" id="linkWithNoTabIndex">Eat lots of food</a><span>...</span> |
<span>...</span><a href="#" id="linkWithTabIndex" tabindex="2">Eat a little food</a><span>...</span> |
@@ -230,7 +230,7 @@ <h2 id="qunit-userAgent"></h2>
<span>...</span><a id="linkWithNoHrefWithTabIndex" tabindex="1">Eat some funyuns</a><span>...</span>
<span>...</span><a id="linkWithNoHrefWithNegativeTabIndex" tabindex="-1">Eat some funyuns</a><span>...</span>
</div>

<div id="liveHandlerOrder">
<span id="liveSpan1"><a href="#" id="liveLink1"></a></span>
<span id="liveSpan2"><a href="#" id="liveLink2"></a></span>
@@ -246,23 +246,23 @@ <h2 id="qunit-userAgent"></h2>
<div id="fx-queue" name="test">
<div id="fadein" class='chain test' name='div'>fadeIn<div>fadeIn</div></div>
<div id="fadeout" class='chain test out'>fadeOut<div>fadeOut</div></div>

<div id="show" class='chain test'>show<div>show</div></div>
<div id="hide" class='chain test out'>hide<div>hide</div></div>

<div id="togglein" class='chain test'>togglein<div>togglein</div></div>
<div id="toggleout" class='chain test out'>toggleout<div>toggleout</div></div>


<div id="slideup" class='chain test'>slideUp<div>slideUp</div></div>
<div id="slidedown" class='chain test out'>slideDown<div>slideDown</div></div>

<div id="slidetogglein" class='chain test'>slideToggleIn<div>slideToggleIn</div></div>
<div id="slidetoggleout" class='chain test out'>slideToggleOut<div>slideToggleOut</div></div>

<div id="fadeto" class='chain test'>fadeTo<div>fadeTo</div></div>
</div>

<div id="fx-tests"></div>
</div>
</body>

0 comments on commit 5057ff9

Please sign in to comment.
You can’t perform that action at this time.