X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fajax.js;h=4ba4548dec55f3c9dbc77503583dc420140a269c;hb=308d6cdad023da190ace2a698ee4815ed8dad9c5;hp=9b8e800e8bb6c655e499d908ce0b8ede39efc2cb;hpb=c14fa516ae5525f93af562910d22f0a836ebdde3;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index 9b8e800..4ba4548 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -570,20 +570,26 @@ 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" || !type && ct.indexOf("javascript") >= 0 ) {
-				jQuery.globalEval( data );
-			}
-
 			// 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, "@")
+					.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]")
+					.replace(/(?:^|:|,)(?:\s*\[)+/g, ""))) {
+						data = (new Function("return " + data))();
+
 				} else {
-					data = (new Function("return " + data))();
+					throw "JSON Syntax Error: " + data;
 				}
+
+			// If the type is "script", eval it in global context
+			} else if ( type === "script" || !type && ct.indexOf("javascript") >= 0 ) {
+				jQuery.globalEval( data );
 			}
 		}