deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Detect JSON Ajax requests by the response content-type (like is done with XML). Fixes #5709.

Browse source
This commit is contained in:
Rick Waldron 2010-01-05 19:48:16 -05:00 • committed by jeresig
parent 230614b4df
commit 787f271052
3 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/ajax.js
View file

@ -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 );