X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=193a85ae04075dac0514fd126b1bd4290ff6d854;hb=44e6beb10304789044de2c5a58f5bb82e8321636;hp=73e1db689c1797bbe9fecd418e79e26cdd305489;hpb=23d600c66d8e1f7298dcb46eedba862279cd251d;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index 73e1db6..193a85a 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -572,19 +572,22 @@ jQuery.extend({
 		if ( typeof data === "string" ) {
 			// Get the JavaScript object, if JSON is used.
 			if ( type === "json" || !type && ct.indexOf("json") >= 0 ) {
-				// Try to use the native JSON parser first
-				if ( window.JSON && window.JSON.parse ) {
-					data = window.JSON.parse( data );
-
 				// Make sure the incoming data is actual JSON
 				// Logic borrowed from http://json.org/json2.js
-				} else if (/^[\],:{}\s]*$/.test(data.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, "@")
+				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 "JSON.parse";
+					throw "Invalid JSON: " + data;
 				}
 
 			// If the type is "script", eval it in global context