library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #465 from anton-ryzhov/master

Browse Source 
Fixes #10076. $.inArray crashes IE6 and Chrome if second argument is `null` or `undefined` (Thanks anton-ryzhov!)
This commit is contained in:
Dave Methvin 2011-08-25 12:22:47 -07:00
commit a839af034d
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core.js
View File

@ -679,6 +679,9 @@ jQuery.extend({
}, },
inArray: function( elem, array ) { inArray: function( elem, array ) {
if ( !array ) {
return -1;
}
if ( indexOf ) { if ( indexOf ) {
return indexOf.call( array, elem ); return indexOf.call( array, elem );

10
test/unit/core.js
View File

@ -934,6 +934,16 @@ test("jQuery.makeArray", function(){
same( jQuery.makeArray({length: "5"}), [], "Make sure object is coerced properly."); same( jQuery.makeArray({length: "5"}), [], "Make sure object is coerced properly.");
}); });
test("jQuery.inArray", function(){
expect(3);
equals( jQuery.inArray( 0, false ), -1 , "Search in 'false' as array returns -1 and doesn't throw exception" );
equals( jQuery.inArray( 0, null ), -1 , "Search in 'null' as array returns -1 and doesn't throw exception" );
equals( jQuery.inArray( 0, undefined ), -1 , "Search in 'undefined' as array returns -1 and doesn't throw exception" );
});
test("jQuery.isEmptyObject", function(){ test("jQuery.isEmptyObject", function(){
expect(2); expect(2);