]> source.dussan.org Git - jquery.git/commitdiff
Tweaked logic for working around Blackberry 4.7 makeArray(RegExp) issue. Fixes #6930.
authorJohn Resig <jeresig@gmail.com>
Wed, 25 Aug 2010 16:27:30 +0000 (09:27 -0700)
committerJohn Resig <jeresig@gmail.com>
Wed, 25 Aug 2010 16:27:30 +0000 (09:27 -0700)
src/core.js

index 50ad55d94ff292629dff8874019b3e154fa3c444..7fa20d4958b22a7ea37b0aa205611128ed157bed 100644 (file)
@@ -595,7 +595,9 @@ jQuery.extend({
                        // The extra typeof function check is to prevent crashes
                        // in Safari 2 (See: #3039)
                        // 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 );
                        } else {
                                jQuery.merge( ret, array );