X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Ffx.js;h=c34b85672033ce68ea9a4a6dfa49e5c401da15a2;hb=9cd5866a292b1d653651237802d80393a9081528;hp=c5c05468a5a223b5f427693959d5fd7f6c79711e;hpb=6faf75fb98ffdeb27dd8ce5a009d65dfa2921ec2;p=jquery.git

diff --git a/src/fx.js b/src/fx.js
index c5c0546..c34b856 100644
--- a/src/fx.js
+++ b/src/fx.js
@@ -28,12 +28,12 @@ jQuery.fn.extend({
 				this[i].style.display = old || "";
 
 				if ( jQuery.css(this[i], "display") === "none" ) {
-					var tagName = this[i].tagName, display;
+					var nodeName = this[i].nodeName, display;
 
-					if ( elemdisplay[ tagName ] ) {
-						display = elemdisplay[ tagName ];
+					if ( elemdisplay[ nodeName ] ) {
+						display = elemdisplay[ nodeName ];
 					} else {
-						var elem = jQuery("<" + tagName + " />").appendTo("body");
+						var elem = jQuery("<" + nodeName + " />").appendTo("body");
 
 						display = elem.css("display");
 						if ( display === "none" )
@@ -41,7 +41,7 @@ jQuery.fn.extend({
 
 						elem.remove();
 
-						elemdisplay[ tagName ] = display;
+						elemdisplay[ nodeName ] = display;
 					}
 
 					jQuery.data(this[i], "olddisplay", display);
@@ -109,6 +109,14 @@ jQuery.fn.extend({
 				self = this;
 
 			for ( p in prop ) {
+				var name = p.replace(rdashAlpha, fcamelCase);
+
+				if ( p !== name ) {
+					prop[ name ] = prop[ p ];
+					delete prop[ p ];
+					p = name;
+				}
+
 				if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
 					return opt.complete.call(this);
 
@@ -132,7 +140,7 @@ jQuery.fn.extend({
 				if ( /toggle|show|hide/.test(val) )
 					e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop );
 				else {
-					var parts = val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),
+					var parts = /^([+-]=)?([\d+-.]+)(.*)$/.exec(val),
 						start = e.cur(true) || 0;
 
 					if ( parts ) {
@@ -156,6 +164,10 @@ jQuery.fn.extend({
 				}
 			});
 
+			if ( jQuery.isEmptyObject( prop ) ) {
+				return optall.complete.call(this);
+			}
+
 			// For JS strict compliance
 			return true;
 		});
@@ -412,3 +424,11 @@ jQuery.extend( jQuery.fx, {
 		}
 	}
 });
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+	jQuery.expr.filters.animated = function(elem){
+		return jQuery.grep(jQuery.timers, function(fn){
+			return elem === fn.elem;
+		}).length;
+	};
+}