X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Feffects.js;h=241dbd03687afe9bd419b910b0e90bbf487fba2e;hb=543db64412b37b5fa1f3d7fea19f62d6db993fb0;hp=5d574a8fff0efe16bcb7968ca7a28a31f1bd5fb8;hpb=329b750af6649b3755920144bf1d52bfc3a42a0e;p=jquery.git

diff --git a/src/effects.js b/src/effects.js
index 5d574a8..241dbd0 100644
--- a/src/effects.js
+++ b/src/effects.js
@@ -13,40 +13,29 @@ var elemdisplay = {},
 		[ "opacity" ]
 	];
 
-function defaultDisplay(nodeName) {
-	if ( !elemdisplay[ nodeName ] ) {
-		var elem = jQuery("<" + nodeName + ">").appendTo("body"),
-			display = elem.css("display");
-
-		elem.remove();
-
-		if ( display === "none" || display === "" ) {
-			display = "block";
-		}
-
-		elemdisplay[ nodeName ] = display;
-	}
-
-	return elemdisplay[ nodeName ];
-}
-
 jQuery.fn.extend({
 	show: function( speed, easing, callback ) {
 		if ( speed || speed === 0 ) {
 			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 ( this[i].style.display === "" && jQuery.css( this[i], "display" ) === "none" ) {
 					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 +48,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 +104,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 +121,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,10 +131,11 @@ 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 {
 							var display = defaultDisplay(this.nodeName);
 
@@ -152,8 +143,8 @@ jQuery.fn.extend({
 							// block-level elements need to be inline with layout
 							if ( display === "inline" ) {
 								this.style.display = "inline-block";
-							}
-							else {
+
+							} else {
 								this.style.display = "inline";
 								this.style.zoom = 1;
 							}
@@ -401,10 +392,11 @@ jQuery.fx.prototype = {
 
 			if ( done ) {
 				// Reset the overflow
-				if ( this.options.overflow != null ) {
-					this.elem.style.overflow = this.options.overflow[0];
-					this.elem.style.overflowX = this.options.overflow[1];
-					this.elem.style.overflowY = this.options.overflow[2];
+				if ( this.options.overflow != null && !jQuery.support.shrinkWrapBlocks ) {
+					var elem = this.elem, options = this.options;
+					jQuery.each( [ "", "X", "Y" ], function (index, value) {
+						elem.style[ "overflow" + value ] = options.overflow[index];
+					} );
 				}
 
 				// Hide the element if the "hide" operation was done
@@ -495,4 +487,21 @@ if ( jQuery.expr && jQuery.expr.filters ) {
 	};
 }
 
+function defaultDisplay( nodeName ) {
+	if ( !elemdisplay[ nodeName ] ) {
+		var elem = jQuery("<" + nodeName + ">").appendTo("body"),
+			display = elem.css("display");
+
+		elem.remove();
+
+		if ( display === "none" || display === "" ) {
+			display = "block";
+		}
+
+		elemdisplay[ nodeName ] = display;
+	}
+
+	return elemdisplay[ nodeName ];
+}
+
 })( jQuery );