X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=4f1fc6c42f2026e52d3c197420f66e1995255a87;hb=22e28b01e60e87b2454f88ca128fb84916b13564;hp=6f09362e5a1d1203436f02f6e219525cd0e03ba6;hpb=fef0f63526df8c4e186780c742fbcd717424581b;p=jquery.git diff --git a/src/ajax.js b/src/ajax.js index 6f09362..4f1fc6c 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -223,36 +223,21 @@ 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 } },