X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=91519d2892aa9edadf26f027c1105a422dd60e7f;hb=0645b71ee6139c19c2c5a488f16f50dc1c31e9ac;hp=37fb75b557e0a75e3b0c5379f4124f8060e189b2;hpb=6cb2945837ccca55204191a8e7a70b2b2486c28e;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index 37fb75b..91519d2 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -175,12 +175,18 @@ jQuery.extend({
 		traditional: false,
 		*/
 		// Create the request object; Microsoft failed to properly
-		// implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available
+		// 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() {
-			return window.ActiveXObject ?
-				new ActiveXObject("Microsoft.XMLHTTP") :
-				new XMLHttpRequest();
+			if ( window.XMLHttpRequest && (window.location.protocol !== "file:" || !window.ActiveXObject) ) {
+				return new window.XMLHttpRequest();
+
+			} else {
+				try {
+					return new window.ActiveXObject("Microsoft.XMLHTTP");
+				} catch(e) {}
+			}
 		},
 		accepts: {
 			xml: "application/xml, text/xml",
@@ -325,6 +331,10 @@ jQuery.extend({
 		// Create the request object
 		var xhr = s.xhr();
 
+		if ( !xhr ) {
+			return;
+		}
+
 		// Open the socket
 		// Passing null username, generates a login popup on Opera (#2865)
 		if ( s.username ) {
@@ -569,9 +579,11 @@ jQuery.extend({
 
 			// Get the JavaScript object, if JSON is used.
 			if ( type === "json" ) {
-				if ( typeof JSON === "object" && JSON.parse ) {
+				// Try to use the native JSON parser first
+				try {
 					data = JSON.parse( data );
-				} else {
+
+				} catch(e) {
 					data = (new Function("return " + data))();
 				}
 			}