aboutsummaryrefslogtreecommitdiffstats
path: root/src/ajax.js
diff options
context:
space:
mode:
authorjaubourg <aubourg.julian@gmail.com>2010-12-21 16:58:52 +0100
committerjaubourg <aubourg.julian@gmail.com>2010-12-21 16:58:52 +0100
commit1db2f02cc78b10bd638d70457645e1daa5c01344 (patch)
tree66a0d788029afdde6aa2fef36d3acac928c93e48 /src/ajax.js
parent91d32e8f9699022ee468c060a24a43f947653f69 (diff)
downloadjquery-1db2f02cc78b10bd638d70457645e1daa5c01344.tar.gz
jquery-1db2f02cc78b10bd638d70457645e1daa5c01344.zip
Rewrote the data conversion logic in ajax. Should be cleaner and faster.
Diffstat (limited to 'src/ajax.js')
-rw-r--r--src/ajax.js29
1 files changed, 12 insertions, 17 deletions
diff --git a/src/ajax.js b/src/ajax.js
index 320c13dd6..a50a039dd 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,13 +189,13 @@ 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:
@@ -210,26 +205,26 @@ jQuery.extend({
// 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: {},
-
+
// 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;
@@ -241,25 +236,25 @@ jQuery.extend({
}
}
},
-
+
// List of data converters
// 1) key format is "source_type => destination_type" (spaces required)
// 2) the catchall symbol "*" can be used for source_type
dataConverters: {
-
+
// Convert anything to text
"* => text": function(data) {
return "" + data;
},
-
+
// Text to html (no transformation)
"text => html": function(data) {
return data;
},
-
+
// Evaluate text as a json expression
"text => json": jQuery.parseJSON,
-
+
// Parse text as xml
"text => xml": function(data) {
var xml, parser;