aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortimmywil <tim.willison@thisismedium.com>2011-04-11 11:54:55 -0400
committertimmywil <tim.willison@thisismedium.com>2011-04-11 11:54:55 -0400
commiteb857e2b714e6786078cf8641941f267a6e19fa0 (patch)
tree6096b38463a0bb54500b8391a4e094c0f8ef3e7e
parent6591f6dd9d1c86144903f60e5d19e624c5bf6751 (diff)
downloadjquery-eb857e2b714e6786078cf8641941f267a6e19fa0.tar.gz
jquery-eb857e2b714e6786078cf8641941f267a6e19fa0.zip
Fix unit tests in firefox 4 and opera 11, passing null or undefined to indexOf was throwing an error in those browsers
-rw-r--r--src/traversing.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/traversing.js b/src/traversing.js
index fb5946bba..485de56d4 100644
--- a/src/traversing.js
+++ b/src/traversing.js
@@ -298,13 +298,18 @@ jQuery.extend({
// Implement the identical functionality for filter and not
function winnow( elements, qualifier, keep ) {
+
+ // Can't pass null or undefined to indexOf in Firefox 4
+ // Set to 0 to skip string check
+ qualifier = qualifier || 0;
+
if ( jQuery.isFunction( qualifier ) ) {
return jQuery.grep(elements, function( elem, i ) {
var retVal = !!qualifier.call( elem, i, elem );
return retVal === keep;
});
- } else if ( qualifier && qualifier.nodeType ) {
+ } else if ( qualifier.nodeType ) {
return jQuery.grep(elements, function( elem, i ) {
return (elem === qualifier) === keep;
});