aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDave Methvin <dave.methvin@gmail.com>2013-01-29 13:03:45 -0500
committerDave Methvin <dave.methvin@gmail.com>2013-01-29 14:40:30 -0500
commitaa3c92979a723cd972bf37c766c3b4a63cc23fdb (patch)
tree92fbc91be2c9164ca2d33bff4aa0426adf309f91 /src
parent0868699ce5d380e094fa869c34626eab3ef9b3ed (diff)
downloadjquery-aa3c92979a723cd972bf37c766c3b4a63cc23fdb.tar.gz
jquery-aa3c92979a723cd972bf37c766c3b4a63cc23fdb.zip
Revert "Fix #13291, no longer need the functionish-regex guard."
Turns out this is still needed by Safari 5.1, which we're still supporting. This reverts commit c4b1da40075532e4f14821b1519ae0ef6665bf1e.
Diffstat (limited to 'src')
-rw-r--r--src/core.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core.js b/src/core.js
index c2dc4bc9b..2bea61e3b 100644
--- a/src/core.js
+++ b/src/core.js
@@ -411,7 +411,8 @@ jQuery.extend({
if ( obj == null ) {
return String( obj );
}
- return typeof obj === "object" ?
+ // Support: Safari <5.1 (functionish RegExp)
+ return typeof obj === "object" || typeof obj === "function" ?
class2type[ core_toString.call(obj) ] || "object" :
typeof obj;
},