Commit 3f648c4e authored by jeresig's avatar jeresig

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

parent b2289f3e
......@@ -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 ) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment