X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ffx%2Ffx.js;h=163f0f65cb689fc8fda951469e59757b720d01ea;hb=83b43a1e927d6b260f35f75bc2c3d177f271be93;hp=da9e49a27f717d901dfc43b717354d0d7a5bcada;hpb=8b51bfbd3212a0bcaa35177056d0932b63eb268f;p=jquery.git

diff --git a/src/fx/fx.js b/src/fx/fx.js
index da9e49a..163f0f6 100644
--- a/src/fx/fx.js
+++ b/src/fx/fx.js
@@ -279,15 +279,18 @@ jQuery.fn.extend({
 	},
 	
 	/**
-	 * A function for making your own, custom, animations. The key aspect of
+	 * A function for making your own, custom animations. The key aspect of
 	 * this function is the object of style properties that will be animated,
 	 * and to what end. Each key within the object represents a style property
 	 * that will also be animated (for example: "height", "top", or "opacity").
 	 *
+	 * Note that properties should be specified using camel case
+	 * eg. marginLeft instead of margin-left.
+	 *
 	 * The value associated with the key represents to what end the property
 	 * will be animated. If a number is provided as the value, then the style
 	 * property will be transitioned from its current state to that new number.
-	 * Oterwise if the string "hide", "show", or "toggle" is provided, a default
+	 * Otherwise if the string "hide", "show", or "toggle" is provided, a default
 	 * animation will be constructed for that property.
 	 *
 	 * @example $("p").animate({
@@ -410,14 +413,14 @@ jQuery.extend({
 		// The styles
 		var y = elem.style;
 		
-		// Store display property
-		var oldDisplay = jQuery.css(elem, "display");
-
-		// Set display property to block for animation
-		y.display = "block";
+		if ( prop == "height" || prop == "width" ) {
+			// Store display property
+			var oldDisplay = jQuery.css(elem, "display");
 
-		// Make sure that nothing sneaks out
-		y.overflow = "hidden";
+			// Make sure that nothing sneaks out
+			var oldOverflow = y.overflow;
+			y.overflow = "hidden";
+		}
 
 		// Simple function for setting a style value
 		z.a = function(){
@@ -426,8 +429,10 @@ jQuery.extend({
 
 			if ( prop == "opacity" )
 				jQuery.attr(y, "opacity", z.now); // Let attr handle opacity
-			else if ( parseInt(z.now) ) // My hate for IE will never die
+			else {
 				y[prop] = parseInt(z.now) + "px";
+				y.display = "block"; // Set display property to block for animation
+			}
 		};
 
 		// Figure out the maximum number to run to
@@ -457,12 +462,12 @@ jQuery.extend({
 			if ( !elem.orig ) elem.orig = {};
 
 			// Remember where we started, so that we can go back to it later
-			elem.orig[prop] = this.cur();
+			elem.orig[prop] = jQuery.attr( elem.style, prop );
 
 			options.show = true;
 
 			// Begin the animation
-			z.custom(0, elem.orig[prop]);
+			z.custom(0, this.cur());
 
 			// Stupid IE, look what you made me do
 			if ( prop != "opacity" )
@@ -474,12 +479,12 @@ jQuery.extend({
 			if ( !elem.orig ) elem.orig = {};
 
 			// Remember where we started, so that we can go back to it later
-			elem.orig[prop] = this.cur();
+			elem.orig[prop] = jQuery.attr( elem.style, prop );
 
 			options.hide = true;
 
 			// Begin the animation
-			z.custom(elem.orig[prop], 0);
+			z.custom(this.cur(), 0);
 		};
 		
 		//Simple 'toggle' function
@@ -487,7 +492,7 @@ jQuery.extend({
 			if ( !elem.orig ) elem.orig = {};
 
 			// Remember where we started, so that we can go back to it later
-			elem.orig[prop] = this.cur();
+			elem.orig[prop] = jQuery.attr( elem.style, prop );
 
 			if(oldDisplay == "none")  {
 				options.show = true;
@@ -497,12 +502,12 @@ jQuery.extend({
 					y[prop] = "1px";
 
 				// Begin the animation
-				z.custom(0, elem.orig[prop]);	
+				z.custom(0, this.cur());	
 			} else {
 				options.hide = true;
 
 				// Begin the animation
-				z.custom(elem.orig[prop], 0);
+				z.custom(this.cur(), 0);
 			}		
 		};
 
@@ -526,13 +531,15 @@ jQuery.extend({
 						done = false;
 
 				if ( done ) {
-					// Reset the overflow
-					y.overflow = "";
+					if ( oldDisplay ) {
+						// Reset the overflow
+						y.overflow = oldOverflow;
 					
-					// Reset the display
-					y.display = oldDisplay;
-					if (jQuery.css(elem, "display") == "none")
-						y.display = "block";
+						// Reset the display
+						y.display = oldDisplay;
+						if (jQuery.css(elem, "display") == "none")
+							y.display = "block";
+					}
 
 					// Hide the element if the "hide" operation was done
 					if ( options.hide ) 
@@ -541,10 +548,7 @@ jQuery.extend({
 					// Reset the properties, if the item has been hidden or shown
 					if ( options.hide || options.show )
 						for ( var p in elem.curAnim )
-							if (p == "opacity")
-								jQuery.attr(y, p, elem.orig[p]);
-							else
-								y[p] = "";
+							jQuery.attr(y, p, elem.orig[p]);
 				}
 
 				// If a callback was provided, execute it