X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffx%2Ffx.js;h=a16b0a51b1d95663045cebd5e063622f47fa6220;hb=109e4b2987d78bf67a45aba3e62c29958aeb8d91;hp=da9e49a27f717d901dfc43b717354d0d7a5bcada;hpb=8b51bfbd3212a0bcaa35177056d0932b63eb268f;p=jquery.git

diff --git a/src/fx/fx.js b/src/fx/fx.js
index da9e49a..a16b0a5 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({
@@ -413,9 +416,6 @@ jQuery.extend({
 		// Store display property
 		var oldDisplay = jQuery.css(elem, "display");
 
-		// Set display property to block for animation
-		y.display = "block";
-
 		// Make sure that nothing sneaks out
 		y.overflow = "hidden";
 
@@ -428,6 +428,8 @@ jQuery.extend({
 				jQuery.attr(y, "opacity", z.now); // Let attr handle opacity
 			else if ( parseInt(z.now) ) // My hate for IE will never die
 				y[prop] = parseInt(z.now) + "px";
+			
+			y.display = "block"; // Set display property to block for animation
 		};
 
 		// Figure out the maximum number to run to