X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fajax.js;h=9501e8a07eb0189fd6078a706ebec3a578e8b000;hb=21e15219be8e04b3fe25d05a65abfaef96830b9f;hp=b5adf2c7fdb44e43e719789e71d173f95d6863a2;hpb=3f648c4e3abe236b8ec6a19822313be794e5a9df;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index b5adf2c..9501e8a 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -555,8 +555,8 @@ jQuery.extend({
 	},
 
 	httpData: function( xhr, type, s ) {
-		var ct = xhr.getResponseHeader("content-type"),
-			xml = type === "xml" || !type && ct && ct.indexOf("xml") >= 0,
+		var ct = xhr.getResponseHeader("content-type") || "",
+			xml = type === "xml" || !type && ct.indexOf("xml") >= 0,
 			data = xml ? xhr.responseXML : xhr.responseText;
 
 		if ( xml && data.documentElement.nodeName === "parsererror" ) {
@@ -571,17 +571,18 @@ jQuery.extend({
 
 		// The filter can actually parse the response
 		if ( typeof data === "string" ) {
-
 			// If the type is "script", eval it in global context
-			if ( type === "script" ) {
+			if ( type === "script" || !type && ct.indexOf("javascript") >= 0 ) {
 				jQuery.globalEval( data );
 			}
 
 			// Get the JavaScript object, if JSON is used.
-			if ( type === "json" ) {
-				if ( typeof JSON === "object" && JSON.parse ) {
+			if ( type === "json" || !type && ct.indexOf("json") >= 0 ) {
+				// Try to use the native JSON parser first
+				try {
 					data = JSON.parse( data );
-				} else {
+
+				} catch(e) {
 					data = (new Function("return " + data))();
 				}
 			}