X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffx.js;h=2d6433dd38549b35ee9bd5742affba41a945546b;hb=654d946ead6bc1f995c04af2abc02da30cfe4f74;hp=626119bc95b8706e773d8c1d576b83cf31e61b34;hpb=5c1725d689c1b5b9a8d3c35aa85c42e71016855b;p=jquery.git

diff --git a/src/fx.js b/src/fx.js
index 626119b..2d6433d 100644
--- a/src/fx.js
+++ b/src/fx.js
@@ -57,15 +57,18 @@ jQuery.fn.extend({
 	_toggle: jQuery.fn.toggle,
 
 	toggle: function( fn, fn2 ){
+		var bool = typeof fn === "boolean";
+
 		return jQuery.isFunction(fn) && jQuery.isFunction(fn2) ?
 			this._toggle.apply( this, arguments ) :
-			fn ?
+			fn == null || bool ?
+				this.each(function(){
+					var state = bool ? fn : jQuery(this).is(":hidden");
+					jQuery(this)[ state ? "show" : "hide" ]();
+				}) :
 				this.animate({
 					height: "toggle", width: "toggle", opacity: "toggle"
-				}, fn, fn2) :
-				this.each(function(){
-					jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ]();
-				});
+				}, fn, fn2);
 	},
 
 	fadeTo: function(speed,to,callback){