X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=9b8e800e8bb6c655e499d908ce0b8ede39efc2cb;hb=c14fa516ae5525f93af562910d22f0a836ebdde3;hp=b5adf2c7fdb44e43e719789e71d173f95d6863a2;hpb=3f648c4e3abe236b8ec6a19822313be794e5a9df;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index b5adf2c..9b8e800 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -178,16 +178,15 @@ jQuery.extend({
 		// implement the XMLHttpRequest in IE7 (can't request local files),
 		// so we use the ActiveXObject when it is available
 		// This function can be overriden by calling jQuery.ajaxSetup
-		xhr: function() {
-			if ( window.XMLHttpRequest && (window.location.protocol !== "file:" || !window.ActiveXObject) ) {
+		xhr: window.XMLHttpRequest && (window.location.protocol !== "file:" || !window.ActiveXObject) ?
+			function() {
 				return new window.XMLHttpRequest();
-
-			} else {
+			} :
+			function() {
 				try {
 					return new window.ActiveXObject("Microsoft.XMLHTTP");
 				} catch(e) {}
-			}
-		},
+			},
 		accepts: {
 			xml: "application/xml, text/xml",
 			html: "text/html",
@@ -555,8 +554,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,16 +570,17 @@ 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 ) {
-					data = JSON.parse( data );
+			if ( type === "json" || !type && ct.indexOf("json") >= 0 ) {
+				// Try to use the native JSON parser first
+				if ( window.JSON && window.JSON.parse ) {
+					data = window.JSON.parse( data );
+
 				} else {
 					data = (new Function("return " + data))();
 				}