Expose the JSON parsing logic. Fixes #5914.
authorjeresig <jeresig@gmail.com>
Sat, 23 Jan 2010 21:51:51 +0000 (16:51 -0500)
committerjeresig <jeresig@gmail.com>
Sat, 23 Jan 2010 21:51:51 +0000 (16:51 -0500)
src/ajax.js
src/core.js

index 502f006..552d412 100644 (file)
@@ -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 {
-                                       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 ) {
index 3ff95e0..5c99068 100644 (file)
@@ -470,6 +470,28 @@ jQuery.extend({
        error: function( msg ) {
                throw msg;
        },
+       
+       parseJSON: function( data ) {
+               // 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 );
+               }
+               
+               return data;    
+       },
 
        noop: function() {},