X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fajax.js;h=552d412f4ad5a0235e03c9f037eadcbd446cdb1f;hb=781fe8b80d08b287e4c6e4ca408f773c6a1f3b2d;hp=3ef2d4f1e675405bff17c97623708655710d6365;hpb=23492fdf9fa6f2c3b8ee85d062fed74297f3c438;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index 3ef2d4f..552d412 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -530,7 +530,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
@@ -578,7 +578,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
@@ -591,23 +591,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 ) {
@@ -665,7 +649,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 );