Don't set the context in .load() as it stops the global ajax events from firing....

[jquery.git] / src / ajax.js

diff --git a/src/ajax.js b/src/ajax.js
index 07e706c..d92d26d 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -45,18 +45,19 @@ jQuery.fn.extend({
                        }
                }
 
+               var self = this;
+
                // Request the remote document
                jQuery.ajax({
                        url: url,
                        type: type,
                        dataType: "html",
                        data: params,
-                       context:this,
                        complete: function( res, status ) {
                                // If successful, inject the HTML into all the matched elements
                                if ( status === "success" || status === "notmodified" ) {
                                        // See if a selector was specified
-                                       this.html( selector ?
+                                       self.html( selector ?
                                                // Create a dummy div to hold the results
                                                jQuery("<div />")
                                                        // inject the contents of the document in, removing the scripts
@@ -71,7 +72,7 @@ jQuery.fn.extend({
                                }
 
                                if ( callback ) {
-                                       this.each( callback, [res.responseText, status, res] );
+                                       self.each( callback, [res.responseText, status, res] );
                                }
                        }
                });
@@ -390,18 +391,19 @@ jQuery.extend({
 
                // Wait for a response to come back
                var onreadystatechange = xhr.onreadystatechange = function( isTimeout ) {
-                       // The request was aborted, clear the interval and decrement jQuery.active
+                       // The request was aborted
                        if ( !xhr || xhr.readyState === 0 ) {
+                               // Opera doesn't call onreadystatechange before this point
+                               // so we simulate the call
+                               if ( !requestDone ) {
+                                       complete();
+                               }
+
                                requestDone = true;
                                if ( xhr ) {
                                        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;
@@ -454,13 +456,13 @@ jQuery.extend({
                try {
                        var oldAbort = xhr.abort;
                        xhr.abort = function() {
-                               oldAbort.call( xhr );
                                if ( xhr ) {
-                                       xhr.readyState = 0;
-                               }
-                               if ( !requestDone ) {
-                                       complete();
+                                       oldAbort.call( xhr );
+                                       if ( xhr ) {
+                                               xhr.readyState = 0;
+                                       }
                                }
+
                                onreadystatechange();
                        };
                } catch(e) { }
@@ -477,7 +479,7 @@ jQuery.extend({
 
                // Send the data
                try {
-                       xhr.send( type === "POST" || type === "PUT" ? s.data : null );
+                       xhr.send( type === "POST" || type === "PUT" || type === "DELETE" ? s.data : null );
                } catch(e) {
                        jQuery.handleError(s, xhr, null, e);
                        // Fire the complete handlers
@@ -529,7 +531,7 @@ jQuery.extend({
        handleError: function( s, xhr, status, e ) {
                // If a local callback was specified, fire it
                if ( s.error ) {
-                       s.error.call( s.context || window, xhr, status, e );
+                       s.error.call( s.context || s, xhr, status, e );
                }
 
                // Fire the global callback
@@ -577,7 +579,7 @@ jQuery.extend({
                        data = xml ? xhr.responseXML : xhr.responseText;
 
                if ( xml && data.documentElement.nodeName === "parsererror" ) {
-                       throw "parsererror";
+                       jQuery.error( "parsererror" );
                }
 
                // Allow a pre-filtering function to sanitize the response
@@ -590,23 +592,7 @@ jQuery.extend({
                if ( typeof data === "string" ) {
                        // Get the JavaScript object, if JSON is used.
                        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 {
-                                       throw "Invalid JSON: " + data;
-                               }
+                               data = jQuery.parseJSON( data );
 
                        // If the type is "script", eval it in global context
                        } else if ( type === "script" || !type && ct.indexOf("javascript") >= 0 ) {
@@ -664,7 +650,7 @@ jQuery.extend({
                                                }
                                        });
                                        
-                               } else if ( !traditional && typeof obj === "object" ) {
+                               } else if ( !traditional && obj != null && typeof obj === "object" ) {
                                        // Serialize object item.
                                        jQuery.each( obj, function( k, v ) {
                                                buildParams( prefix + "[" + k + "]", v );