git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
cb40495
)
Tweaked logic for working around Blackberry 4.7 makeArray(RegExp) issue. Fixes #6930.
author
John Resig
<jeresig@gmail.com>
Wed, 25 Aug 2010 16:27:30 +0000
(09:27 -0700)
committer
John Resig
<jeresig@gmail.com>
Wed, 25 Aug 2010 16:27:30 +0000
(09:27 -0700)
src/core.js
patch
|
blob
|
history
diff --git
a/src/core.js
b/src/core.js
index
50ad55d
..
7fa20d4
100644
(file)
--- a/
src/core.js
+++ b/
src/core.js
@@
-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
// 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 );
push.call( ret, array );
} else {
jQuery.merge( ret, array );