X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=27e8a1f5edfe5bdfb8ea47a0142a09165a69a2c9;hb=6f53be1839b10486c624e07595533d57c602eda5;hp=6f09362e5a1d1203436f02f6e219525cd0e03ba6;hpb=d5bb001b9a3cbe0753d11f7c20cede83e9c2d775;p=jquery.git diff --git a/src/ajax.js b/src/ajax.js index 6f09362..27e8a1f 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -197,62 +197,22 @@ jQuery.extend({ // 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; - if ( ! documentElement || ! documentElement.nodeName ) { - jQuery.error("typeerror"); - } - if ( documentElement.nodeName == "parsererror" ) { - jQuery.error("parsererror"); - } - } - }, - // 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 to html (true = no transformation) + "text html": true, // 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 } },