Tweaked logic for working around Blackberry 4.7 makeArray(RegExp) issue. Fixes #6930.

This commit is contained in:
John Resig 2010-08-25 09:27:30 -07:00
parent cb40495b21
commit 18dad47489

View File

@ -595,7 +595,9 @@ jQuery.extend({
// The extra typeof function check is to prevent crashes // The extra typeof function check is to prevent crashes
// in Safari 2 (See: #3039) // in Safari 2 (See: #3039)
// Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930 // Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
if ( array.length == null || typeof array === "string" || jQuery.isFunction(array) || typeof array === "function" || typeof array.setInterval !== "undefined" ) { var type = toString.call(array);
if ( array.length == null || type === "[object String]" || type === "[object Function]" || type === "[object RegExp]" || (typeof type !== "function" && array.setInterval) ) {
push.call( ret, array ); push.call( ret, array );
} else { } else {
jQuery.merge( ret, array ); jQuery.merge( ret, array );