From 5057ff9f43017f673894584358ca95c8753b65d4 Mon Sep 17 00:00:00 2001 From: Colin Snover Date: Tue, 5 Oct 2010 14:53:35 -0500 Subject: [PATCH] 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. --- src/effects.js | 33 ++++++++----- src/support.js | 57 ++++++++++++++-------- test/index.html | 42 ++++++++-------- test/unit/effects.js | 131 ++++++++++++++++++++++++++++++++------------------ 4 files changed, 162 insertions(+), 101 deletions(-) diff --git a/src/effects.js b/src/effects.js index 5d574a8..4b9c7cc 100644 --- a/src/effects.js +++ b/src/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]; diff --git a/src/support.js b/src/support.js index 878db1f..85deb1b 100644 --- a/src/support.js +++ b/src/support.js @@ -67,6 +67,7 @@ noCloneEvent: true, boxModel: null, inlineBlockNeedsLayout: false, + shrinkWrapBlocks: false, reliableHiddenOffsets: true }; @@ -120,17 +121,25 @@ 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 = '
'; + jQuery.support.shrinkWrapBlocks = div.offsetWidth !== 2; } + div.innerHTML = '
t
'; + 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 @@ -138,30 +147,36 @@ // 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 = '
t
'; - 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"); diff --git a/test/index.html b/test/index.html index 262bd9a..03e1d97 100644 --- a/test/index.html +++ b/test/index.html @@ -48,7 +48,7 @@

    - +
    @@ -59,9 +59,9 @@

    See this blog entry for more information.

    - Here are some links in a normal paragraph: Google, - Google Groups (Link). - This link has class="blog": + Here are some links in a normal paragraph: Google, + Google Groups (Link). + This link has class="blog": diveintomark

    @@ -87,14 +87,14 @@ - + - + - + - + - + - + - + test element Float test. @@ -157,7 +157,7 @@ - +
    @@ -213,7 +213,7 @@ Z
    - +
    1. Rice
      2. @@ -221,7 +221,7 @@ Z
    2. Blinis
    3. Tofu
    - +
    I'm hungry. I should...
    ...Eat lots of food... | ...Eat a little food... | @@ -230,7 +230,7 @@ Z ...Eat some funyuns... ...Eat some funyuns...
    - +
    @@ -246,23 +246,23 @@ Z
    fadeIn
    fadeIn
    fadeOut
    fadeOut
    - +
    show
    show
    hide
    hide
    - +
    togglein
    togglein
    toggleout
    toggleout
    - - + +
    slideUp
    slideUp
    slideDown
    slideDown
    - +
    slideToggleIn
    slideToggleIn
    slideToggleOut
    slideToggleOut
    fadeTo
    fadeTo
    - +
    diff --git a/test/unit/effects.js b/test/unit/effects.js index 284eec3..47266ed 100644 --- a/test/unit/effects.js +++ b/test/unit/effects.js @@ -37,6 +37,7 @@ test("show()", function() { ok( pass, "Show with " + name + " does not call animate callback" ); }); + // #show-tests * is set display: none in CSS jQuery("#main").append('

    ');
 
 	var old = jQuery("#show-tests table").show().css("display") !== "table";
@@ -69,6 +70,7 @@ test("show(Number) - other displays", function() {
 	QUnit.reset();
 	stop();
 
+	// #show-tests * is set display: none in CSS
 	jQuery("#main").append('
    ');
 
 	var old = jQuery("#show-tests table").show().css("display") !== "table",
@@ -124,7 +126,7 @@ test("animate negative height", function() {
 	});
 });
 
-test("animate inline width/height", function() {
+test("animate block as inline width/height", function() {
 	expect(3);
 	stop();
 	jQuery("#foo").css({ display: "inline", width: '', height: '' }).animate({ width: 42, height: 42 }, 100, function() {
@@ -135,6 +137,20 @@ test("animate inline width/height", function() {
 	});
 });
 
+test("animate native inline width/height", function() {
+	expect(3);
+	stop();
+	jQuery("#foo").css({ display: "", width: '', height: '' })
+		.append('text')
+		.children('span')
+			.animate({ width: 42, height: 42 }, 100, function() {
+				equals( jQuery(this).css("display"), "inline-block", "inline-block was set on non-floated inline element when animating width/height" );
+				equals( this.offsetWidth, 42, "width was animated" );
+				equals( this.offsetHeight, 42, "height was animated" );
+				start();
+			});
+});
+
 test("animate block width/height", function() {
 	expect(3);
 	stop();
@@ -158,12 +174,31 @@ test("animate table width/height", function() {
 	});
 });
 
+test("animate table-row width/height", function() {
+	expect(3);
+	stop();
+	var tr = jQuery("#table")
+		.attr({ "cellspacing": 0, "cellpadding": 0, "border": 0 })
+		.html("
    ")
+		.find("tr");
+
+	// IE<8 uses “block” instead of the correct display type
+	var displayMode = tr.css("display") !== "table-row" ? "block" : "table-row";
+
+	tr.animate({ width: 10, height: 10 }, 100, function() {
+		equals( jQuery(this).css("display"), displayMode, "display mode is correct" );
+		equals( this.offsetWidth, 20, "width animated to shrink wrap point" );
+		equals( this.offsetHeight, 20, "height animated to shrink wrap point" );
+		start();
+	});
+});
+
 test("animate table-cell width/height", function() {
 	expect(3);
 	stop();
 	var td = jQuery("#table")
 		.attr({ "cellspacing": 0, "cellpadding": 0, "border": 0 })
-		.append("
    ")
+		.html("
    ")
 		.find("td");
 
 	// IE<8 uses “block” instead of the correct display type
@@ -212,7 +247,7 @@ test("animate option (queue === false)", function () {
 
 test("animate with no properties", function() {
 	expect(2);
-	
+
 	var divs = jQuery("div"), count = 0;
 
 	divs.animate({}, function(){
@@ -234,30 +269,30 @@ test("animate with no properties", function() {
 
 test("animate duration 0", function() {
 	expect(11);
-	
+
 	stop();
-	
+
 	var $elems = jQuery([{ a:0 },{ a:0 }]), counter = 0;
-	
+
 	equals( jQuery.timers.length, 0, "Make sure no animation was running from another test" );
-		
+
 	$elems.eq(0).animate( {a:1}, 0, function(){
 		ok( true, "Animate a simple property." );
 		counter++;
 	});
-	
+
 	// Failed until [6115]
 	equals( jQuery.timers.length, 0, "Make sure synchronic animations are not left on jQuery.timers" );
-	
+
 	equals( counter, 1, "One synchronic animations" );
-	
+
 	$elems.animate( { a:2 }, 0, function(){
 		ok( true, "Animate a second simple property." );
 		counter++;
 	});
-	
+
 	equals( counter, 3, "Multiple synchronic animations" );
-	
+
 	$elems.eq(0).animate( {a:3}, 0, function(){
 		ok( true, "Animate a third simple property." );
 		counter++;
@@ -268,12 +303,12 @@ test("animate duration 0", function() {
 		equals( counter, 5, "One synchronic and one asynchronic" );
 		start();
 	});
-	
+
 	var $elem = jQuery("
    ");
-	$elem.show(0, function(){ 
+	$elem.show(0, function(){
 		ok(true, "Show callback with no duration");
 	});
-	$elem.hide(0, function(){ 
+	$elem.hide(0, function(){
 		ok(true, "Hide callback with no duration");
 	});
 });
@@ -415,7 +450,7 @@ test("toggle()", function() {
 	ok( x.is(":hidden"), "is hidden" );
 	x.toggle();
 	ok( x.is(":visible"), "is visible again" );
-	
+
 	x.toggle(true);
 	ok( x.is(":visible"), "is visible" );
 	x.toggle(false);
@@ -425,9 +460,10 @@ test("toggle()", function() {
 });
 
 jQuery.checkOverflowDisplay = function(){
-	var o = jQuery.css( this, "overflow" );
+	var o = jQuery.css( this, "overflow" ),
+		expected = jQuery.support.shrinkWrapBlocks ? "hidden" : "visible";
 
-	equals(o, "visible", "Overflow should be visible: " + o);
+	equals(o, expected, "Overflow should be " + expected + ": " + o);
 	equals(jQuery.css( this, "display" ), "inline", "Display shouldn't be tampered with.");
 
 	start();
@@ -445,7 +481,7 @@ test("JS Overflow and Display", function() {
 		.after("text after")
 		.animate({ opacity: 0.5 }, "slow", jQuery.checkOverflowDisplay);
 });
-		
+
 test("CSS Overflow and Display", function() {
 	expect(2);
 	stop();
@@ -517,16 +553,16 @@ jQuery.each( {
 	}, function(tn, t){
 		test(fn + " to " + tn, function() {
 			var elem = jQuery.makeTest( fn + " to " + tn );
-	
+
 			var t_w = t( elem, "width" );
 			var f_w = f( elem, "width" );
 			var t_h = t( elem, "height" );
 			var f_h = f( elem, "height" );
 			var t_o = t( elem, "opacity" );
 			var f_o = f( elem, "opacity" );
-			
+
 			var num = 0;
-			
+
 			if ( t_h == "show" ) num++;
 			if ( t_w == "show" ) num++;
 			if ( t_w == "hide"||t_w == "show" ) num++;
@@ -536,52 +572,52 @@ jQuery.each( {
 			if ( t_o.constructor == Number ) num += 2;
 			if ( t_w.constructor == Number ) num += 2;
 			if ( t_h.constructor == Number ) num +=2;
-			
+
 			expect(num);
 			stop();
-	
+
 			var anim = { width: t_w, height: t_h, opacity: t_o };
-	
+
 			elem.animate(anim, 50, function(){
 				if ( t_w == "show" )
 					equals( this.style.display, "block", "Showing, display should block: " + this.style.display);
-					
+
 				if ( t_w == "hide"||t_w == "show" )
 					ok(f_w === "" ? this.style.width === f_w : this.style.width.indexOf(f_w) === 0, "Width must be reset to " + f_w + ": " + this.style.width);
-					
+
 				if ( t_h == "hide"||t_h == "show" )
 					ok(f_h === "" ? this.style.height === f_h : this.style.height.indexOf(f_h) === 0, "Height must be reset to " + f_h + ": " + this.style.height);
-					
+
 				var cur_o = jQuery.style(this, "opacity");
 
 				if ( t_o == "hide" || t_o == "show" )
 					equals(cur_o, f_o, "Opacity must be reset to " + f_o + ": " + cur_o);
-					
+
 				if ( t_w == "hide" )
 					equals(this.style.display, "none", "Hiding, display should be none: " + this.style.display);
-					
+
 				if ( t_o.constructor == Number ) {
 					equals(cur_o, t_o, "Final opacity should be " + t_o + ": " + cur_o);
-					
+
 					ok(jQuery.css(this, "opacity") != "" || cur_o == t_o, "Opacity should be explicitly set to " + t_o + ", is instead: " + cur_o);
 				}
-					
+
 				if ( t_w.constructor == Number ) {
 					equals(this.style.width, t_w + "px", "Final width should be " + t_w + ": " + this.style.width);
-					
+
 					var cur_w = jQuery.css(this,"width");
 
 					ok(this.style.width != "" || cur_w == t_w, "Width should be explicitly set to " + t_w + ", is instead: " + cur_w);
 				}
-					
+
 				if ( t_h.constructor == Number ) {
 					equals(this.style.height, t_h + "px", "Final height should be " + t_h + ": " + this.style.height);
-					
+
 					var cur_h = jQuery.css(this,"height");
 
 					ok(this.style.height != "" || cur_h == t_h, "Height should be explicitly set to " + t_h + ", is instead: " + cur_w);
 				}
-				
+
 				if ( t_h == "show" ) {
 					var old_h = jQuery.css(this, "height");
 					jQuery(this).append("
    Some more text
    and some more...");
@@ -592,7 +628,7 @@ jQuery.each( {
 						equals(jQuery.css(this, "height"), old_h, "Make sure height is not auto.");
 					}
 				}
-	
+
 				start();
 			});
 		});
@@ -600,9 +636,9 @@ jQuery.each( {
 });
 
 jQuery.fn.saveState = function(){
-	var check = ['opacity','height','width','display','overflow'];	
+	var check = ['opacity','height','width','display','overflow'];
 	expect(check.length);
-	
+
 	stop();
 	return this.each(function(){
 		var self = this;
@@ -617,6 +653,9 @@ jQuery.checkState = function(){
 	var self = this;
 	jQuery.each(this.save, function(c,v){
 		var cur = self.style[ c ] || jQuery.css(self, c);
+		if ( c === "overflow" && jQuery.support.shrinkWrapBlocks ) {
+			v = "hidden";
+		}
 		equals( cur, v, "Make sure that " + c + " is reset (Old: " + v + " Cur: " + cur + ")");
 	});
 	start();
@@ -704,26 +743,26 @@ test("jQuery.show('fast') doesn't clear radio buttons (bug #1095)", function ()
 });
 
 test("animate with per-property easing", function(){
-	
+
 	expect(3);
 	stop();
-	
+
 	var _test1_called = false;
 	var _test2_called = false;
 	var _default_test_called = false;
-	
+
 	jQuery.easing['_test1'] = function() {
 		_test1_called = true;
 	};
-	
+
 	jQuery.easing['_test2'] = function() {
 		_test2_called = true;
 	};
-	
+
 	jQuery.easing['_default_test'] = function() {
 		_default_test_called = true;
 	};
-	
+
 	jQuery({a:0,b:0,c:0}).animate({
 		a: [100, '_test1'],
 		b: [100, '_test2'],
@@ -734,5 +773,5 @@ test("animate with per-property easing", function(){
 		ok(_test2_called, "Easing function (2) called");
 		ok(_default_test_called, "Easing function (_default) called");
 	});
-	
+
 });
-- 
1.7.10.4