Make empty strings (and other non-string values) simply return null from parseJSON...

[jquery.git] / src / ajax.js

diff --git a/src/ajax.js b/src/ajax.js
index f1de0f8..552d412 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -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 ) {