Detect JSON Ajax requests by the response content-type (like is done with XML). Fixes...

[jquery.git] / src / ajax.js

diff --git a/src/ajax.js b/src/ajax.js
index 098a561..6d4026b 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 ) {
@@ -380,29 +390,21 @@ jQuery.extend({
                }
 
                // Wait for a response to come back
-               var onreadystatechange = function( isTimeout ) {
+               var onreadystatechange = xhr.onreadystatechange = function( isTimeout ) {
                        // The request was aborted, clear the interval and decrement jQuery.active
                        if ( !xhr || xhr.readyState === 0 ) {
-                               if ( ival ) {
-                                       // clear poll interval
-                                       clearInterval( ival );
-                                       ival = null;
-
-                                       // Handle the global AJAX counter
-                                       if ( s.global && ! --jQuery.active ) {
-                                               jQuery.event.trigger( "ajaxStop" );
-                                       }
+                               requestDone = true;
+                               xhr.onreadystatechange = jQuery.noop;
+
+                               // Handle the global AJAX counter
+                               if ( s.global && ! --jQuery.active ) {
+                                       jQuery.event.trigger( "ajaxStop" );
                                }
 
                        // 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;
-
-                               // clear poll interval
-                               if (ival) {
-                                       clearInterval(ival);
-                                       ival = null;
-                               }
+                               xhr.onreadystatechange = jQuery.noop;
 
                                status = isTimeout === "timeout" ?
                                        "timeout" :
@@ -446,19 +448,14 @@ jQuery.extend({
                        }
                };
 
-               if ( s.async ) {
-                       // don't attach the handler to the request, just poll it instead
-                       var ival = setInterval(onreadystatechange, 13);
-
-                       // Timeout checker
-                       if ( s.timeout > 0 ) {
-                               setTimeout(function() {
-                                       // Check to see if the request is still happening
-                                       if ( xhr && !requestDone ) {
-                                               onreadystatechange( "timeout" );
-                                       }
-                               }, s.timeout);
-                       }
+               // Timeout checker
+               if ( s.async && s.timeout > 0 ) {
+                       setTimeout(function() {
+                               // Check to see if the request is still happening
+                               if ( xhr && !requestDone ) {
+                                       onreadystatechange( "timeout" );
+                               }
+                       }, s.timeout);
                }
 
                // Send the data
@@ -560,6 +557,7 @@ jQuery.extend({
        httpData: function( xhr, type, s ) {
                var ct = xhr.getResponseHeader("content-type"),
                        xml = type === "xml" || !type && ct && ct.indexOf("xml") >= 0,
+                       json = type === "json" || !type && ct && ct.indexOf("json") >= 0,
                        data = xml ? xhr.responseXML : xhr.responseText;
 
                if ( xml && data.documentElement.nodeName === "parsererror" ) {
@@ -581,10 +579,12 @@ jQuery.extend({
                        }
 
                        // Get the JavaScript object, if JSON is used.
-                       if ( type === "json" ) {
-                               if ( typeof JSON === "object" && JSON.parse ) {
+                       if ( json ) {
+                               // Try to use the native JSON parser first
+                               try {
                                        data = JSON.parse( data );
-                               } else {
+
+                               } catch(e) {
                                        data = (new Function("return " + data))();
                                }
                        }