]> source.dussan.org Git - jquery.git/commitdiff
remove redundant condition 749/head
authorRichard Gibson <richard.gibson@gmail.com>
Sun, 22 Apr 2012 18:53:36 +0000 (14:53 -0400)
committerRichard Gibson <richard.gibson@gmail.com>
Sun, 22 Apr 2012 18:53:36 +0000 (14:53 -0400)
src/ajax/jsonp.js

index 7b2ac4929ee11b9792ae5f826ab1b1b41c0dabe6..6b82b8262626f76b7a85ff637750769f49b61f60 100644 (file)
@@ -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 ) ?