Backing out fix for #5803 from 3b50eac.

Karunakar · Oct 26, 2010 · de58db0 · de58db0
1 parent 9b97599
commit de58db0
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 21 deletions.
diff --git 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
@@ -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() {