Regression: makes sure that all instances of a callback are removed. …

…Unit test added.
jquery · Apr 25, 2012 · 245f5a244e024cb99ac84be86f86b88654a909c9 · gibson042 · Apr 25, 2012 · jaubourg
1 parent 97210d4
commit 245f5a244e024cb99ac84be86f86b88654a909c9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/callbacks.js b/src/callbacks.js
@@ -119,8 +119,8 @@ jQuery.Callbacks = function( options ) {
 			// Remove a callback from the list
 			remove: function() {
 				if ( list ) {
-					jQuery.each( arguments, function( index, arg ) {
-						if ( ( index = jQuery.inArray( arg, list ) ) > -1 ) {
+					jQuery.each( arguments, function( _, arg, index ) {
+						while( ( index = jQuery.inArray( arg, list, index || 0 ) ) > -1 ) {
 							list.splice( index, 1 );
 							// Handle firing indexes
 							if ( firing ) {

diff --git a/test/unit/callbacks.js b/test/unit/callbacks.js
@@ -235,3 +235,18 @@ test( "jQuery.Callbacks.fireWith - arguments are copied", function() {
 		strictEqual( hello, "hello", "arguments are copied internally" );
 	});
 });
+
+test( "jQuery.Callbacks.remove - should remove all instances", function() {
+
+	expect( 1 );
+
+	var cb = jQuery.Callbacks();
+
+	function fn() {
+		ok( false, "function wasn't removed" );
+	}
+
+	cb.add( fn, fn, function() {
+		ok( true, "end of test" );
+	}).remove( fn ).fire();
+});