X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=9195bcc89eb48d44cd0e34edfeccdfdb524d8618;hb=a42f7a2590ea21dbe8eb1e11f927a952bdd30c1e;hp=b39bc8ddbada1a8e77600fe919cb21143ce7c554;hpb=a4fc842019a678a331c7322a5be747e6adc426ca;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index b39bc8d..9195bcc 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" ) {
@@ -512,11 +506,12 @@ jQuery.extend({
 	// Serialize an array of form elements or a set of
 	// key/values into a query string
 	param: function( a, traditional ) {
-		var s = [], add = function( key, value ) {
-			// If value is a function, invoke it and return its value
-			value = jQuery.isFunction(value) ? value() : value;
-			s[ s.length ] = encodeURIComponent(key) + "=" + encodeURIComponent(value);
-		};
+		var s = [],
+			add = function( key, value ) {
+				// If value is a function, invoke it and return its value
+				value = jQuery.isFunction(value) ? value() : value;
+				s[ s.length ] = encodeURIComponent(key) + "=" + encodeURIComponent(value);
+			};
 		
 		// Set traditional to true for jQuery <= 1.3.2 behavior.
 		if ( traditional === undefined ) {