Merge branch 'useragent'

[jquery.git] / src / ajax.js

diff --git a/src/ajax.js b/src/ajax.js
index 182a88e..91519d2 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 ) {
@@ -570,9 +579,11 @@ jQuery.extend({
 
                        // Get the JavaScript object, if JSON is used.
                        if ( type === "json" ) {
-                               if ( typeof JSON === "object" && JSON.parse ) {
+                               // Try to use the native JSON parser first
+                               try {
                                        data = JSON.parse( data );
-                               } else {
+
+                               } catch(e) {
                                        data = (new Function("return " + data))();
                                }
                        }