diff options
| -rw-r--r-- | src/callbacks.js | 5 | ||||
| -rw-r--r-- | test/unit/callbacks.js | 9 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/callbacks.js b/src/callbacks.js index 893f5760b..37acabcba 100644 --- a/src/callbacks.js +++ b/src/callbacks.js @@ -92,9 +92,10 @@ jQuery.Callbacks = function( options ) { var start = list.length; (function add( args ) { jQuery.each( args, function( _, arg ) { - if ( jQuery.isFunction( arg ) && ( !options.unique || !self.has( arg ) ) ) { + var type = jQuery.type( arg ); + if ( type === "function" && ( !options.unique || !self.has( arg ) ) ) { list.push( arg ); - } else if ( arg && arg.length ) { + } else if ( arg && arg.length && type !== "string" ) { // Inspect recursively add( arg ); } diff --git a/test/unit/callbacks.js b/test/unit/callbacks.js index 2bc5c92d6..2c708bb59 100644 --- a/test/unit/callbacks.js +++ b/test/unit/callbacks.js @@ -250,3 +250,12 @@ test( "jQuery.Callbacks.remove - should remove all instances", function() { ok( true, "end of test" ); }).remove( fn ).fire(); }); + +test( "jQuery.Callbacks() - adding a string doesn't cause a stack overflow", function() { + + expect( 1 ); + + jQuery.Callbacks().add( "hello world" ); + + ok( true, "no stack overflow" ); +}); |