From: John Resig <jeresig@gmail.com>
Date: Tue, 26 Oct 2010 00:54:27 +0000 (-0700)
Subject: Backing out fix for #5803 from 3b50eaca2cd0b1439235e39c4e98a6438e8f55b2.
X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=commitdiff_plain;h=de58db0cdf4dc08db8683ad6cd0035c5d64b26ac

Backing out fix for #5803 from 3b50eaca2cd0b1439235e39c4e98a6438e8f55b2.
---

diff --git a/src/ajax.js b/src/ajax.js
index b39bc8d..ff293da 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 7344659..b2e51fb 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() {