X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fajax%2Fajax.js;h=9c9a5df3646d7f53e8d8430dc522d39144ae91c1;hb=2fac5e7949ec342c450b2e032509eed0e35cf1ff;hp=9042a48d5df88952e50fc81ef3f23d3863cb881c;hpb=e6ffe025033f82d752ec4966c6b12c49d8e1dc29;p=jquery.git

diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js
index 9042a48..9c9a5df 100644
--- a/src/ajax/ajax.js
+++ b/src/ajax/ajax.js
@@ -132,12 +132,6 @@ jQuery.fn.extend({
 
 });
 
-// If IE is used, create a wrapper for the XMLHttpRequest object
-if ( !window.XMLHttpRequest )
-	XMLHttpRequest = function(){
-		return new ActiveXObject("Microsoft.XMLHTTP");
-	};
-
 // Attach a bunch of functions for handling common AJAX events
 
 /**
@@ -624,8 +618,9 @@ jQuery.extend({
 
 		var requestDone = false;
 
-		// Create the request object
-		var xml = new XMLHttpRequest();
+		// Create the request object; Microsoft failed to properly
+		// implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available
+		var xml = window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest();
 
 		// Open the socket
 		xml.open(s.type, s.url, s.async);