X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=592c25cfbdaef51d71b845a32414674478404291;hb=1e1a9c7eb055511dce74e4b5f807b93d5a76bbd6;hp=3f4f732bd30a2aaaa3c45e172b7741e9a3843fb8;hpb=1f92edee207829a28de80ee72548cdbd599bcc79;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index 3f4f732..592c25c 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -181,12 +181,7 @@ jQuery.extend({
 		xhr: function() {
 			return new window.XMLHttpRequest();
 		},
-		xhrResponseFields: {
-			xml: "XML",
-			text: "Text",
-			json: "JSON"
-		},
-			
+
 		accepts: {
 			xml: "application/xml, text/xml",
 			html: "text/html",
@@ -194,41 +189,42 @@ jQuery.extend({
 			json: "application/json, text/javascript",
 			"*": "*/*"
 		},
-		
+
 		autoDataType: {
 			xml: /xml/,
 			html: /html/,
 			json: /json/
 		},
-		
+
 		// Prefilters
 		// 1) They are useful to introduce custom dataTypes (see transport/jsonp for an example)
 		// 2) These are called:
 		//    * BEFORE asking for a transport
 		//    * AFTER param serialization (s.data is a string if s.processData is true)
-		// 3) They MUST be order agnostic
-		prefilters: [],
-		
+		// 3) key is the dataType
+		// 4) the catchall symbol "*" can be used
+		// 5) execution will start with transport dataType and THEN continue down to "*" if needed
+		prefilters: {},
+
 		// Transports bindings
 		// 1) key is the dataType
 		// 2) the catchall symbol "*" can be used
 		// 3) selection will start with transport dataType and THEN go to "*" if needed
-		transports: {
-		},
-		
+		transports: {},
+
 		// Checkers
 		// 1) key is dataType
 		// 2) they are called to control successful response
 		// 3) error throws is used as error data
 		dataCheckers: {
-	
+
 			// Check if data is a string
 			"text": function(data) {
 				if ( typeof data != "string" ) {
 					jQuery.error("typeerror");
 				}
 			},
-	
+
 			// Check if xml has been properly parsed
 			"xml": function(data) {
 				var documentElement = data ? data.documentElement : data;
@@ -240,38 +236,23 @@ jQuery.extend({
 				}
 			}
 		},
-		
+
 		// List of data converters
-		// 1) key format is "source_type => destination_type" (spaces required)
+		// 1) key format is "source_type destination_type" (a single space in-between)
 		// 2) the catchall symbol "*" can be used for source_type
 		dataConverters: {
-		
+
 			// Convert anything to text
-			"* => text": function(data) {
-				return "" + data;
-			},
-			
+			"* text": window.String,
+
 			// Text to html (no transformation)
-			"text => html": function(data) {
-				return data;
-			},
-			
+			"text html": window.String,
+
 			// Evaluate text as a json expression
-			"text => json": jQuery.parseJSON,
-			
+			"text json": jQuery.parseJSON,
+
 			// Parse text as xml
-			"text => xml": function(data) {
-				var xml, parser;
-				if ( window.DOMParser ) { // Standard
-					parser = new DOMParser();
-					xml = parser.parseFromString(data,"text/xml");
-				} else { // IE
-					xml = new ActiveXObject("Microsoft.XMLDOM");
-					xml.async="false";
-					xml.loadXML(data);
-				}
-				return xml;
-			}
+			"text xml": jQuery.parseXML
 		}
 	},