aboutsummaryrefslogtreecommitdiffstats
path: root/src/ajax
diff options
context:
space:
mode:
authorRichard Gibson <richard.gibson@gmail.com>2012-04-22 14:53:36 -0400
committerRichard Gibson <richard.gibson@gmail.com>2012-04-22 14:53:36 -0400
commit180a997da5fffa619a468eec2f391cdd75aa06dc (patch)
treefe5f60418107a9f0c664437dff066429d558886e /src/ajax
parent2d1247a413f889f711a77a12de63d79dfe14f069 (diff)
downloadjquery-180a997da5fffa619a468eec2f391cdd75aa06dc.tar.gz
jquery-180a997da5fffa619a468eec2f391cdd75aa06dc.zip
remove redundant condition
Diffstat (limited to 'src/ajax')
-rw-r--r--src/ajax/jsonp.js3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/ajax/jsonp.js b/src/ajax/jsonp.js
index 7b2ac4929..6b82b8262 100644
--- 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 ) ?