X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Ffx.js;h=801d92c0c65116e542c2af9379d65f1f96f06e9e;hb=3dc5bc5a8b61eafba7a299f8cd772779a5bc8957;hp=8025de4d218f96c2e457f306d33728fc9c945b2e;hpb=48e9a3999596c2ee1f4470a78637de8f27e3b219;p=jquery.git

diff --git a/src/fx.js b/src/fx.js
index 8025de4..801d92c 100644
--- a/src/fx.js
+++ b/src/fx.js
@@ -19,7 +19,7 @@ function genFx( type, num ){
 
 jQuery.fn.extend({
 	show: function(speed,callback){
-		if ( speed ) {
+		if ( speed !== undefined ) {
 			return this.animate( genFx("show", 3), speed, callback);
 		} else {
 			for ( var i = 0, l = this.length; i < l; i++ ){
@@ -59,7 +59,7 @@ jQuery.fn.extend({
 	},
 
 	hide: function(speed,callback){
-		if ( speed ) {
+		if ( speed !== undefined ) {
 			return this.animate( genFx("hide", 3), speed, callback);
 		} else {
 			for ( var i = 0, l = this.length; i < l; i++ ){
@@ -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);
 
@@ -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;
+	};
+}