deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Expose the JSON parsing logic. Fixes #5914.

Browse source
This commit is contained in:
jeresig 2010-01-23 16:51:51 -05:00
parent a6ef036bb6
commit 0912109ffc
2 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/ajax.js
View 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 ) {

22
src/core.js
View 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() {},