Make sure that the ActiveX exception is caught if it's unable to be loaded. Fixes...

[jquery.git] / src / ajax.js

diff --git a/src/ajax.js b/src/ajax.js
index 2249dc6..b5adf2c 100644 (file)
--- 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 ) {
@@ -384,7 +394,7 @@ jQuery.extend({
                        // The request was aborted, clear the interval and decrement jQuery.active
                        if ( !xhr || xhr.readyState === 0 ) {
                                requestDone = true;
-                               xhr.onreadystatechange = function(){};
+                               xhr.onreadystatechange = jQuery.noop;
 
                                // Handle the global AJAX counter
                                if ( s.global && ! --jQuery.active ) {
@@ -394,7 +404,7 @@ jQuery.extend({
                        // The transfer is complete and the data is available, or the request timed out
                        } else if ( !requestDone && xhr && (xhr.readyState === 4 || isTimeout === "timeout") ) {
                                requestDone = true;
-                               xhr.onreadystatechange = function(){};
+                               xhr.onreadystatechange = jQuery.noop;
 
                                status = isTimeout === "timeout" ?
                                        "timeout" :