X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=871481d01ab832b319a2ea4ce8e54f84f6b86213;hb=265cf0efa7ab3296b3fc4917b863d7b09e3d8bb4;hp=5c4d469fda84a37dedac6bbfae969fe6d7e3160b;hpb=8ab23aec2c333834a6e442fa15b73125ba857afe;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index 5c4d469..871481d 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -175,11 +175,12 @@ jQuery.extend({
 		timeout: 0,
 		data: null,
 		dataType: null,
-		dataTypes: null,
 		username: null,
 		password: null,
 		cache: null,
 		traditional: false,
+		headers: {},
+		crossDomain: null,
 		*/
 		xhr: function() {
 			return new window.XMLHttpRequest();
@@ -583,12 +584,6 @@ jQuery.extend({
 		// Remove hash character (#7531: and string promotion)
 		s.url = ( "" + s.url ).replace( rhash , "" );
 
-		// Uppercase the type
-		s.type = s.type.toUpperCase();
-
-		// Determine if request has content
-		s.hasContent = ! rnoContent.test( s.type );
-
 		// Extract dataTypes list
 		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( /\s+/ );
 
@@ -604,13 +599,19 @@ jQuery.extend({
 		}
 
 		// Convert data if not already a string
-		if ( s.data && s.processData && typeof s.data != "string" ) {
+		if ( s.data && s.processData && typeof s.data !== "string" ) {
 			s.data = jQuery.param( s.data , s.traditional );
 		}
 
 		// Apply prefilters
 		jQuery.ajaxPrefilter( s , options );
 
+		// Uppercase the type
+		s.type = s.type.toUpperCase();
+
+		// Determine if request has content
+		s.hasContent = ! rnoContent.test( s.type );
+
 		// Watch for a new set of requests
 		if ( s.global && jQuery.active++ === 0 ) {
 			jQuery.event.trigger( "ajaxStart" );