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

diff --git a/src/ajax.js b/src/ajax.js
index 182a88e5a7f6572dfcba7431971d208736c0ec02..b5adf2c7fdb44e43e719789e71d173f95d6863a2 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -179,9 +179,14 @@ jQuery.extend({
                // so we use the ActiveXObject when it is available
                // This function can be overriden by calling jQuery.ajaxSetup
                xhr: function() {
-                       return window.XMLHttpRequest && window.location.protocol !== "file:" || window.ActiveXObject ?
-                               new window.XMLHttpRequest() :
-                               new window.ActiveXObject("Microsoft.XMLHTTP");
+                       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",
@@ -326,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 ) {