Browse files

remove redundant condition

  • Loading branch information...
1 parent 2d1247a commit 180a997da5fffa619a468eec2f391cdd75aa06dc @gibson042 gibson042 committed Apr 22, 2012
Showing with 1 addition and 2 deletions.
  1. +1 −2 src/ajax/jsonp.js
View
3 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 ) ?

0 comments on commit 180a997

Please sign in to comment.