aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDave Methvin <dave.methvin@gmail.com>2011-08-25 12:22:47 -0700
committerDave Methvin <dave.methvin@gmail.com>2011-08-25 12:22:47 -0700
commita839af034db2bd934e4d4fa6758a3fed8de74174 (patch)
tree1a3456c5115e55d3599d182028c0a614acdbb0ec /src
parentf4811bfb04206b9d9c120001603eadb1b529c271 (diff)
parent190136cf6132620327a86274fb108fabf55a1d4f (diff)
downloadjquery-a839af034db2bd934e4d4fa6758a3fed8de74174.tar.gz
jquery-a839af034db2bd934e4d4fa6758a3fed8de74174.zip
Merge pull request #465 from anton-ryzhov/master
Fixes #10076. $.inArray crashes IE6 and Chrome if second argument is `null` or `undefined` (Thanks anton-ryzhov!)
Diffstat (limited to 'src')
-rw-r--r--src/core.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core.js b/src/core.js
index 0b99b74a2..85a381661 100644
--- a/src/core.js
+++ b/src/core.js
@@ -679,6 +679,9 @@ jQuery.extend({
},
inArray: function( elem, array ) {
+ if ( !array ) {
+ return -1;
+ }
if ( indexOf ) {
return indexOf.call( array, elem );