Core: Standardize indexOf comparisons

gibson042 · gibson042 · commit 6ae222a54f68 · 2015-01-10T23:56:39.000-05:00
not present: `< 0` present: `> -1` at index: `=== N` (cherry picked from commit 53aa87f) Closes gh-1985
diff --git a/src/ajax/jsonp.js b/src/ajax/jsonp.js
@@ -25,7 +25,8 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
 		jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ?
 			"url" :
 			typeof s.data === "string" &&
-				!( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") &&
+				( s.contentType || "" )
+					.indexOf("application/x-www-form-urlencoded") === 0 &&
 				rjsonp.test( s.data ) && "data"
 		);
 
diff --git a/src/ajax/load.js b/src/ajax/load.js
@@ -24,7 +24,7 @@ jQuery.fn.load = function( url, params, callback ) {
 		self = this,
 		off = url.indexOf(" ");
 
-	if ( off >= 0 ) {
+	if ( off > -1 ) {
 		selector = jQuery.trim( url.slice( off, url.length ) );
 		url = url.slice( 0, off );
 	}
diff --git a/src/attributes/classes.js b/src/attributes/classes.js
@@ -76,7 +76,7 @@ jQuery.fn.extend({
 					j = 0;
 					while ( (clazz = classes[j++]) ) {
 						// Remove *all* instances
-						while ( cur.indexOf( " " + clazz + " " ) >= 0 ) {
+						while ( cur.indexOf( " " + clazz + " " ) > -1 ) {
 							cur = cur.replace( " " + clazz + " ", " " );
 						}
 					}
@@ -149,7 +149,7 @@ jQuery.fn.extend({
 			l = this.length;
 		for ( ; i < l; i++ ) {
 			if ( this[i].nodeType === 1 &&
-				(" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
+				(" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) {
 
 				return true;
 			}
diff --git a/src/attributes/val.js b/src/attributes/val.js
@@ -128,7 +128,7 @@ jQuery.extend({
 				while ( i-- ) {
 					option = options[ i ];
 					if ( (option.selected =
-							jQuery.inArray( jQuery.valHooks.option.get( option ), values ) >= 0) ) {
+							jQuery.inArray( jQuery.valHooks.option.get( option ), values ) > -1) ) {
 						optionSet = true;
 					}
 				}
@@ -149,7 +149,7 @@ jQuery.each([ "radio", "checkbox" ], function() {
 	jQuery.valHooks[ this ] = {
 		set: function( elem, value ) {
 			if ( jQuery.isArray( value ) ) {
-				return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
+				return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) > -1 );
 			}
 		}
 	};
diff --git a/src/event.js b/src/event.js
@@ -250,7 +250,7 @@ jQuery.event = {
 			return;
 		}
 
-		if ( type.indexOf(".") >= 0 ) {
+		if ( type.indexOf(".") > -1 ) {
 			// Namespaced trigger; create a regexp to match event type in handle()
 			namespaces = type.split(".");
 			type = namespaces.shift();
@@ -460,7 +460,7 @@ jQuery.event = {
 
 						if ( matches[ sel ] === undefined ) {
 							matches[ sel ] = handleObj.needsContext ?
-								jQuery( sel, this ).index( cur ) >= 0 :
+								jQuery( sel, this ).index( cur ) > -1 :
 								jQuery.find( sel, this, null, [ cur ] ).length;
 						}
 						if ( matches[ sel ] ) {
diff --git a/src/manipulation.js b/src/manipulation.js
@@ -332,7 +332,7 @@ jQuery.extend({
 
 			// #4087 - If origin and destination elements are the same, and this is
 			// that element, do not do anything
-			if ( selection && jQuery.inArray( elem, selection ) !== -1 ) {
+			if ( selection && jQuery.inArray( elem, selection ) > -1 ) {
 				continue;
 			}
 
diff --git a/src/traversing/findFilter.js b/src/traversing/findFilter.js
@@ -33,7 +33,7 @@ function winnow( elements, qualifier, not ) {
 	}
 
 	return jQuery.grep( elements, function( elem ) {
-		return ( jQuery.inArray( elem, qualifier ) >= 0 ) !== not;
+		return ( jQuery.inArray( elem, qualifier ) > -1 ) !== not;
 	});
 }
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ jQuery.fn.load = function( url, params, callback ) {`
`24`	`24`	`self = this,`
`25`	`25`	`off = url.indexOf(" ");`
`26`	`26`
`27`		`- if ( off >= 0 ) {`
	`27`	`+ if ( off > -1 ) {`
`28`	`28`	`selector = jQuery.trim( url.slice( off, url.length ) );`
`29`	`29`	`url = url.slice( 0, off );`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ jQuery.fn.extend({`
`76`	`76`	`j = 0;`
`77`	`77`	`while ( (clazz = classes[j++]) ) {`
`78`	`78`	`// Remove all instances`
`79`		`- while ( cur.indexOf( " " + clazz + " " ) >= 0 ) {`
	`79`	`+ while ( cur.indexOf( " " + clazz + " " ) > -1 ) {`
`80`	`80`	`cur = cur.replace( " " + clazz + " ", " " );`
`81`	`81`	`}`
`82`	`82`	`}`
`@@ -149,7 +149,7 @@ jQuery.fn.extend({`
`149`	`149`	`l = this.length;`
`150`	`150`	`for ( ; i < l; i++ ) {`
`151`	`151`	`if ( this[i].nodeType === 1 &&`
`152`		`- (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {`
	`152`	`+ (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) {`
`153`	`153`
`154`	`154`	`return true;`
`155`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ jQuery.extend({`
`128`	`128`	`while ( i-- ) {`
`129`	`129`	`option = options[ i ];`
`130`	`130`	`if ( (option.selected =`
`131`		`- jQuery.inArray( jQuery.valHooks.option.get( option ), values ) >= 0) ) {`
	`131`	`+ jQuery.inArray( jQuery.valHooks.option.get( option ), values ) > -1) ) {`
`132`	`132`	`optionSet = true;`
`133`	`133`	`}`
`134`	`134`	`}`
`@@ -149,7 +149,7 @@ jQuery.each([ "radio", "checkbox" ], function() {`
`149`	`149`	`jQuery.valHooks[ this ] = {`
`150`	`150`	`set: function( elem, value ) {`
`151`	`151`	`if ( jQuery.isArray( value ) ) {`
`152`		`- return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );`
	`152`	`+ return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) > -1 );`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`	`};`
Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ jQuery.extend({`
`332`	`332`
`333`	`333`	`// #4087 - If origin and destination elements are the same, and this is`
`334`	`334`	`// that element, do not do anything`
`335`		`- if ( selection && jQuery.inArray( elem, selection ) !== -1 ) {`
	`335`	`+ if ( selection && jQuery.inArray( elem, selection ) > -1 ) {`
`336`	`336`	`continue;`
`337`	`337`	`}`
`338`	`338`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ function winnow( elements, qualifier, not ) {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`return jQuery.grep( elements, function( elem ) {`
`36`		`- return ( jQuery.inArray( elem, qualifier ) >= 0 ) !== not;`
	`36`	`+ return ( jQuery.inArray( elem, qualifier ) > -1 ) !== not;`
`37`	`37`	`});`
`38`	`38`	`}`
`39`	`39`