Make sure that the xhr object still exists after the abort is called.
[jquery.git] / src / ajax.js
index bd87252..8aa6a9a 100644 (file)
@@ -40,7 +40,7 @@ jQuery.fn.extend({
 
                        // Otherwise, build a param string
                        } else if ( typeof params === "object" ) {
-                               params = jQuery.param( params );
+                               params = jQuery.param( params, jQuery.ajaxSettings.traditional );
                                type = "POST";
                        }
                }
@@ -172,15 +172,21 @@ jQuery.extend({
                data: null,
                username: null,
                password: null,
+               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();
-               },
+               xhr: window.XMLHttpRequest && (window.location.protocol !== "file:" || !window.ActiveXObject) ?
+                       function() {
+                               return new window.XMLHttpRequest();
+                       } :
+                       function() {
+                               try {
+                                       return new window.ActiveXObject("Microsoft.XMLHTTP");
+                               } catch(e) {}
+                       },
                accepts: {
                        xml: "application/xml, text/xml",
                        html: "text/html",
@@ -204,7 +210,7 @@ jQuery.extend({
 
                // convert data if not already a string
                if ( s.data && s.processData && typeof s.data !== "string" ) {
-                       s.data = jQuery.param(s.data);
+                       s.data = jQuery.param( s.data, s.traditional );
                }
 
                // Handle JSONP Parameter Callbacks
@@ -324,6 +330,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 ) {
@@ -379,29 +389,24 @@ jQuery.extend({
                }
 
                // Wait for a response to come back
-               var onreadystatechange = function( isTimeout ) {
-                       // The request was aborted, clear the interval and decrement jQuery.active
+               var onreadystatechange = xhr.onreadystatechange = function( isTimeout ) {
+                       // The request was aborted
                        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" );
-                                       }
+                               // Opera doesn't call onreadystatechange before this point
+                               // so we simulate the call
+                               if ( !requestDone ) {
+                                       complete();
+                               }
+
+                               requestDone = true;
+                               if ( xhr ) {
+                                       xhr.onreadystatechange = jQuery.noop;
                                }
 
                        // 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" :
@@ -445,19 +450,30 @@ 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" );
+               // Override the abort handler, if we can (IE doesn't allow it, but that's OK)
+               // Opera doesn't fire onreadystatechange at all on abort
+               try {
+                       var oldAbort = xhr.abort;
+                       xhr.abort = function() {
+                               if ( xhr ) {
+                                       oldAbort.call( xhr );
+                                       if ( xhr ) {
+                                               xhr.readyState = 0;
                                        }
-                               }, s.timeout);
-                       }
+                               }
+
+                               onreadystatechange();
+                       };
+               } catch(e) { }
+
+               // 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
@@ -557,8 +573,8 @@ jQuery.extend({
        },
 
        httpData: function( xhr, type, s ) {
-               var ct = xhr.getResponseHeader("content-type"),
-                       xml = type === "xml" || !type && ct && ct.indexOf("xml") >= 0,
+               var ct = xhr.getResponseHeader("content-type") || "",
+                       xml = type === "xml" || !type && ct.indexOf("xml") >= 0,
                        data = xml ? xhr.responseXML : xhr.responseText;
 
                if ( xml && data.documentElement.nodeName === "parsererror" ) {
@@ -573,19 +589,29 @@ jQuery.extend({
 
                // The filter can actually parse the response
                if ( typeof data === "string" ) {
-
-                       // If the type is "script", eval it in global context
-                       if ( type === "script" ) {
-                               jQuery.globalEval( data );
-                       }
-
                        // Get the JavaScript object, if JSON is used.
-                       if ( type === "json" ) {
-                               if ( typeof JSON === "object" && JSON.parse ) {
-                                       data = JSON.parse( data );
+                       if ( type === "json" || !type && ct.indexOf("json") >= 0 ) {
+                               // Make sure the incoming data is actual JSON
+                               // Logic borrowed from http://json.org/json2.js
+                               if (/^[\],:{}\s]*$/.test(data.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, "@")
+                                       .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]")
+                                       .replace(/(?:^|:|,)(?:\s*\[)+/g, ""))) {
+
+                                       // Try to use the native JSON parser first
+                                       if ( window.JSON && window.JSON.parse ) {
+                                               data = window.JSON.parse( data );
+
+                                       } else {
+                                               data = (new Function("return " + data))();
+                                       }
+
                                } else {
-                                       data = (new Function("return " + data))();
+                                       throw "Invalid JSON: " + data;
                                }
+
+                       // If the type is "script", eval it in global context
+                       } else if ( type === "script" || !type && ct.indexOf("javascript") >= 0 ) {
+                               jQuery.globalEval( data );
                        }
                }
 
@@ -594,12 +620,14 @@ jQuery.extend({
 
        // Serialize an array of form elements or a set of
        // key/values into a query string
-       param: function( a ) {
+       param: function( a, traditional ) {
                
-               var s = [],
-                       
-                       // Set jQuery.param.traditional to true for jQuery <= 1.3.2 behavior.
-                       traditional = jQuery.param.traditional;
+               var s = [];
+               
+               // Set traditional to true for jQuery <= 1.3.2 behavior.
+               if ( traditional === undefined ) {
+                       traditional = jQuery.ajaxSettings.traditional;
+               }
                
                function add( key, value ) {
                        // If value is a function, invoke it and return its value
@@ -615,8 +643,8 @@ jQuery.extend({
                        });
                        
                } else {
-                       // If jQuery.param.traditional is true, encode the "old" way (the
-                       // way 1.3.2 or older did it), otherwise encode params recursively.
+                       // If traditional, encode the "old" way (the way 1.3.2 or older
+                       // did it), otherwise encode params recursively.
                        jQuery.each( a, function buildParams( prefix, obj ) {
                                
                                if ( jQuery.isArray(obj) ) {