Making sure that you can bind multiple toggles to a single element without problems...

diff --git a/src/event.js b/src/event.js
index 7cfb535b6f1d8a5242303bc78ec8f97001be9eeb..e2087cc13cbdf77f7ff59056aeda292793458ced 100644 (file)
--- a/src/event.js
+++ b/src/event.js
@@ -693,13 +693,14 @@ jQuery.fn.extend({
 
                return this.click( jQuery.event.proxy( fn, function( event ) {
                        // Figure out which function to execute
-                       this.lastToggle = ( this.lastToggle || 0 ) % i;
+                       var lastToggle = ( jQuery.data( this, 'lastToggle' + fn.guid ) || 0 ) % i;
+                       jQuery.data( this, 'lastToggle' + fn.guid, lastToggle + 1 );
 
                        // Make sure that clicks stop
                        event.preventDefault();
 
                        // and execute the function
-                       return args[ this.lastToggle++ ].apply( this, arguments ) || false;
+                       return args[ lastToggle ].apply( this, arguments ) || false;
                }));
        },
 

diff --git a/test/unit/event.js b/test/unit/event.js
index d2da8e2412be10b62875cf2f969ebf5a833aac1a..2b4d8e59c693bc091f9c3ce1286644eeca8f3938 100644 (file)
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -532,7 +532,7 @@ test("jQuery.Event.currentTarget", function(){
 });
 
 test("toggle(Function, Function, ...)", function() {
-       expect(11);
+       expect(16);
        
        var count = 0,
                fn1 = function(e) { count++; },
@@ -585,6 +585,22 @@ test("toggle(Function, Function, ...)", function() {
        $div.unbind('click',fns[0]);
        var data = jQuery.data( $div[0], 'events' );
        ok( !data, "Unbinding one function from toggle unbinds them all");
+
+       // Test Multi-Toggles
+       var a = [], b = [];
+       $div = jQuery("<div/>");
+       $div.toggle(function(){ a.push(1); }, function(){ a.push(2); });
+       $div.click();
+       same( a, [1], "Check that a click worked." );
+
+       $div.toggle(function(){ b.push(1); }, function(){ b.push(2); });
+       $div.click();
+       same( a, [1,2], "Check that a click worked with a second toggle." );
+       same( b, [1], "Check that a click worked with a second toggle." );
+
+       $div.click();
+       same( a, [1,2,1], "Check that a click worked with a second toggle, second click." );
+       same( b, [1,2], "Check that a click worked with a second toggle, second click." );
 });
 
 test(".live()/.die()", function() {