remove redundant condition

jquery · Apr 22, 2012 · 180a997 · 180a997
1 parent 2d1247a
commit 180a997
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/ajax/jsonp.js b/src/ajax/jsonp.js
@@ -28,8 +28,7 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
 			rjsonp.test( data );
 
 	// Handle iff the expected data type is "jsonp" or we have a parameter to set
-	if ( s.dataTypes[ 0 ] === "jsonp" || hasCallback &&
-		( replaceInUrl || replaceInData ) ) {
+	if ( s.dataTypes[ 0 ] === "jsonp" || replaceInUrl || replaceInData ) {
 
 		// Get callback name, remembering preexisting value associated with it
 		callbackName = s.jsonpCallback = jQuery.isFunction( s.jsonpCallback ) ?