Added an extra function check to prevent crashes in Safari 2. Fixes #3039.

This commit is contained in:
John Resig 2009-12-06 20:20:49 -08:00
parent 5980292856
commit 62a34450c0

View file

@ -417,7 +417,9 @@ jQuery.extend({
if ( array != null ) { if ( array != null ) {
// The window, strings (and functions) also have 'length' // The window, strings (and functions) also have 'length'
if ( array.length == null || typeof array === "string" || jQuery.isFunction(array) || array.setInterval ) { // The extra typeof function check is to prevent crashes
// in Safari 2 (See: #3039)
if ( array.length == null || typeof array === "string" || jQuery.isFunction(array) || (typeof array !== "function" && array.setInterval) ) {
push.call( ret, array ); push.call( ret, array );
} else { } else {
jQuery.merge( ret, array ); jQuery.merge( ret, array );