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

Bug 7587; Enhancement/1.6 Feature: Bypass regexp filter on $.parseJSON and use native thrown exceptions if window.JSON.parse is available

Browse source
This commit is contained in:
Dan Heberden 2011-04-05 01:43:14 -07:00
parent 2ed81b44be
commit a7e7dbd978
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/core.js
View file

@ -515,16 +515,18 @@ jQuery.extend({
// Make sure leading/trailing whitespace is removed (IE can't handle it) // Make sure leading/trailing whitespace is removed (IE can't handle it)
data = jQuery.trim( data ); data = jQuery.trim( data );
// Attempt to parse using the native JSON parser first
if ( window.JSON && window.JSON.parse ) {
return window.JSON.parse( data );
}
// Make sure the incoming data is actual JSON // Make sure the incoming data is actual JSON
// Logic borrowed from http://json.org/json2.js // Logic borrowed from http://json.org/json2.js
if ( rvalidchars.test(data.replace(rvalidescape, "@") if ( rvalidchars.test( data.replace( rvalidescape, "@" )
.replace(rvalidtokens, "]") .replace( rvalidtokens, "]" )
.replace(rvalidbraces, "")) ) { .replace( rvalidbraces, "")) ) {
// Try to use the native JSON parser first return (new Function( "return " + data ))();
return window.JSON && window.JSON.parse ?
window.JSON.parse( data ) :
(new Function("return " + data))();
} else { } else {
jQuery.error( "Invalid JSON: " + data ); jQuery.error( "Invalid JSON: " + data );

2
test/unit/ajax.js
View file

@ -1600,7 +1600,7 @@ test("jQuery.ajax() - malformed JSON", function() {
}, },
error: function(xhr, msg, detailedMsg) { error: function(xhr, msg, detailedMsg) {
equals( "parsererror", msg, "A parse error occurred." ); equals( "parsererror", msg, "A parse error occurred." );
ok( /^Invalid JSON/.test(detailedMsg), "Detailed parsererror message provided" ); ok( /^(Invalid|SyntaxError|exception)/i.test(detailedMsg), "Detailed parsererror message provided" );
start(); start();
} }
}); });