Changeset 5350

Timestamp:

04/29/08 21:35:35 (7 months ago)

Author:

aflesler

Message:

jquery event: jQuery.toggle can accept more than 2 functions, closes #2378

Location:

trunk/jquery/src

Files:

• event.js (modified) (2 diffs)
• fx.js (modified) (1 diff)

trunk/jquery/src/event.js

@@ -444 +444 @@
         return this.click(function(event) {
             // Figure out which function to execute
-            this.lastToggle = 0 == this.lastToggle ? 1 : 0;
+            this.lastToggle = (this.lastToggle||0) % args.length;
             
             // Make sure that clicks stop
@@ -450 +450 @@
             
             // and execute the function
-            return args[this.lastToggle].apply( this, arguments ) || false;
+            return args[this.lastToggle++].apply( this, arguments ) || false;
         });
     },

trunk/jquery/src/fx.js

@@ -36 +36 @@
     toggle: function( fn, fn2 ){
         return jQuery.isFunction(fn) && jQuery.isFunction(fn2) ?
-            this._toggle( fn, fn2 ) :
+            this._toggle.apply( this, arguments ) :
             fn ?
                 this.animate({