diff options
| -rw-r--r-- | src/callbacks.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/callbacks.js b/src/callbacks.js index 42f9315e9..b3b1c8a69 100644 --- a/src/callbacks.js +++ b/src/callbacks.js @@ -94,12 +94,11 @@ jQuery.Callbacks = function( options ) { var start = list.length; (function add( args ) { jQuery.each( args, function( _, arg ) { - var type; - if ( ( type = jQuery.type(arg) ) === "array" ) { + if ( jQuery.isFunction( arg ) && ( !options.unique || !self.has( arg ) ) ) { + list.push( arg ); + } else if ( arg && arg.length ) { // Inspect recursively add( arg ); - } else if ( type === "function" && ( !options.unique || !self.has( arg ) ) ) { - list.push( arg ); } }); })( arguments ); @@ -121,7 +120,7 @@ jQuery.Callbacks = function( options ) { remove: function() { if ( list ) { jQuery.each( arguments, function( _, arg ) { - var index = 0; + var index; while( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) { list.splice( index, 1 ); // Handle firing indexes @@ -170,7 +169,8 @@ jQuery.Callbacks = function( options ) { }, // Call all callbacks with the given context and arguments fireWith: function( context, args ) { - args = [ context, jQuery.merge( [], args || [] ) ]; + args = args || []; + args = [ context, args.slice ? args.slice() : args ]; if ( list && ( !fired || stack ) ) { if ( firing ) { stack.push( args ); |