X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=9501e8a07eb0189fd6078a706ebec3a578e8b000;hb=6861b5d4eb16222ed5ea623af6ce75362b55d1d4;hp=6d4026b9d3f78b5e44f0d72726e6015a7fa3ef27;hpb=787f271052220c20787104f0eba6441aedac22ff;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index 6d4026b..9501e8a 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -555,9 +555,8 @@ 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,
+		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" ) {
@@ -572,14 +571,13 @@ 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 ( json ) {
+			if ( type === "json" || !type && ct.indexOf("json") >= 0 ) {
 				// Try to use the native JSON parser first
 				try {
 					data = JSON.parse( data );