jquery fx: Closes #3219. jQuery.fn.toggle can accept a boolean argument indicating...

diff --git a/src/fx.js b/src/fx.js
index 626119bc95b8706e773d8c1d576b83cf31e61b34..2d6433dd38549b35ee9bd5742affba41a945546b 100644 (file)
--- 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){

diff --git a/test/unit/fx.js b/test/unit/fx.js
index f8b63835e9a58cfe006148ce3cc5d892d00ca705..8af92979e25ad72f1e4dc8afef33736d1ace930d 100644 (file)
--- a/test/unit/fx.js
+++ b/test/unit/fx.js
@@ -155,13 +155,20 @@ test("stop(clearQueue, gotoEnd)", function() {
 });
 
 test("toggle()", function() {
-       expect(3);
+       expect(6);
        var x = jQuery("#foo");
        ok( x.is(":visible"), "is visible" );
        x.toggle();
        ok( x.is(":hidden"), "is hidden" );
        x.toggle();
        ok( x.is(":visible"), "is visible again" );
+       
+       x.toggle(true);
+       ok( x.is(":visible"), "is visible" );
+       x.toggle(false);
+       ok( x.is(":hidden"), "is hidden" );
+       x.toggle(true);
+       ok( x.is(":visible"), "is visible again" );
 });
 
 var visible = {