From de58db0cdf4dc08db8683ad6cd0035c5d64b26ac Mon Sep 17 00:00:00 2001 From: John Resig Date: Mon, 25 Oct 2010 17:54:27 -0700 Subject: [PATCH] Backing out fix for #5803 from 3b50eaca2cd0b1439235e39c4e98a6438e8f55b2. --- src/ajax.js | 6 ------ test/unit/ajax.js | 15 --------------- 2 files changed, 21 deletions(-) diff --git a/src/ajax.js b/src/ajax.js index b39bc8ddb..ff293da6a 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -208,12 +208,6 @@ jQuery.extend({ s.data = jQuery.param( s.data, s.traditional ); } - // If the jsonpCallback has been set, we can assume that dataType is jsonp - // Ticket #5803 - if ( s.jsonpCallback ) { - s.dataType = "jsonp"; - } - // Handle JSONP Parameter Callbacks if ( s.dataType === "jsonp" ) { if ( type === "GET" ) { diff --git a/test/unit/ajax.js b/test/unit/ajax.js index 734465916..b2e51fbcf 100644 --- a/test/unit/ajax.js +++ b/test/unit/ajax.js @@ -825,21 +825,6 @@ test("jQuery.ajax() - JSONP, Local", function() { plus(); } }); - - // Supports Ticket #5803 - jQuery.ajax({ - url: "data/jsonp.php", - jsonpCallback: "jsonpResults", - success: function(data){ - ok( data.data, "JSON results returned without dataType:jsonp when jsonpCallback is defined" ); - plus(); - }, - error: function(data){ - ok( false, "Ajax error JSON (GET, custom callback name)" ); - plus(); - } - }); - }); test("JSONP - Custom JSONP Callback", function() { -- 2.39.5