From 62a34450c0961e461a72ce4d96f94551ef393b56 Mon Sep 17 00:00:00 2001 From: John Resig Date: Sun, 6 Dec 2009 20:20:49 -0800 Subject: [PATCH] Added an extra function check to prevent crashes in Safari 2. Fixes #3039. --- src/core.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/core.js b/src/core.js index b738ce4..c865bfb 100644 --- a/src/core.js +++ b/src/core.js @@ -417,7 +417,9 @@ jQuery.extend({ if ( array != null ) { // 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 ); } else { jQuery.merge( ret, array ); -- 1.7.10.4