X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=6d4026b9d3f78b5e44f0d72726e6015a7fa3ef27;hb=787f271052220c20787104f0eba6441aedac22ff;hp=91519d2892aa9edadf26f027c1105a422dd60e7f;hpb=230614b4df313493813d688b63ab68f3812a0030;p=jquery.git diff --git a/src/ajax.js b/src/ajax.js index 91519d2..6d4026b 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -557,6 +557,7 @@ jQuery.extend({ httpData: function( xhr, type, s ) { var ct = xhr.getResponseHeader("content-type"), xml = type === "xml" || !type && ct && ct.indexOf("xml") >= 0, + json = type === "json" || !type && ct && ct.indexOf("json") >= 0, data = xml ? xhr.responseXML : xhr.responseText; if ( xml && data.documentElement.nodeName === "parsererror" ) { @@ -578,7 +579,7 @@ jQuery.extend({ } // Get the JavaScript object, if JSON is used. - if ( type === "json" ) { + if ( json ) { // Try to use the native JSON parser first try { data = JSON.parse( data );