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 502f006..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] );
                                }
                        }
                });
@@ -591,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 {
-                                       jQuery.error( "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 ) {