Skip to content
Permalink
Browse files

Expose the JSON parsing logic. Fixes #5914.

  • Loading branch information
jeresig committed Jan 23, 2010
1 parent a6ef036 commit 0912109ffc86610161c769534df84400ccd1aa65
Showing with 23 additions and 17 deletions.
  1. +1 −17 src/ajax.js
  2. +22 −0 src/core.js
@@ -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 ) {
@@ -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() {},

0 comments on commit 0912109

Please sign in to comment.
You can’t perform that action at this time.