From: John Resig <jeresig@gmail.com>
Date: Tue, 28 Sep 2010 17:12:33 +0000 (-0700)
Subject: Make sure we have a fallback when XMLHttpRequest is manually disabled. Fixes #6298.
X-Git-Tag: 1.4.3rc1~32
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=873c28425fb64fdb48cfa09d17041bded39b301f;p=jquery.git

Make sure we have a fallback when XMLHttpRequest is manually disabled. Fixes #6298.
---

diff --git a/src/ajax.js b/src/ajax.js
index 31efc566f..e61548068 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -180,19 +180,10 @@ jQuery.extend({
 		password: null,
 		traditional: false,
 		*/
-		// Create the request object; Microsoft failed to properly
-		// 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: window.XMLHttpRequest && (window.location.protocol !== "file:" || !window.ActiveXObject) ?
-			function() {
-				return new window.XMLHttpRequest();
-			} :
-			function() {
-				try {
-					return new window.ActiveXObject("Microsoft.XMLHTTP");
-				} catch(e) {}
-			},
+		xhr: function() {
+			return new window.XMLHttpRequest();
+		},
 		accepts: {
 			xml: "application/xml, text/xml",
 			html: "text/html",
@@ -695,6 +686,27 @@ jQuery.extend( jQuery.ajax, {
 
 });
 
+/*
+ * Create the request object; Microsoft failed to properly
+ * implement the XMLHttpRequest in IE7 (can't request local files),
+ * so we use the ActiveXObject when it is available
+ * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
+ * we need a fallback.
+ */
+if ( window.ActiveXObject ) {
+	jQuery.ajaxSettings.xhr = function() {
+		if ( window.location.protocol !== "file:" ) {
+			try {
+				return new window.XMLHttpRequest();
+			} catch(e) {}
+		}
+
+		try {
+			return new window.ActiveXObject("Microsoft.XMLHTTP");
+		} catch(e) {}
+	};
+}
+
 // Does this browser support XHR requests?
 jQuery.support.ajax = !!jQuery.ajaxSettings.xhr();