aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRick Waldron <waldron.rick@gmail.com>2012-12-17 17:02:23 -0500
committerRick Waldron <waldron.rick@gmail.com>2012-12-26 13:34:36 -0500
commitbd9498c5ee91303f72bb44f09b4c6c28a33f1225 (patch)
tree604f1901108b503c266b599b5edde48425c05f2e
parent25d933909b7ff2e1bdb330667c81e50a5eef5505 (diff)
downloadjquery-bd9498c5ee91303f72bb44f09b4c6c28a33f1225.tar.gz
jquery-bd9498c5ee91303f72bb44f09b4c6c28a33f1225.zip
2.0: Remove JSON.parse shim
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
-rw-r--r--src/core.js34
1 files changed, 1 insertions, 33 deletions
diff --git a/src/core.js b/src/core.js
index 44ad7fe67..d4166ce19 100644
--- a/src/core.js
+++ b/src/core.js
@@ -52,12 +52,6 @@ var
// Match a standalone tag
rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>|)$/,
- // JSON RegExp
- rvalidchars = /^[\],:{}\s]*$/,
- rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
- rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,
- rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,
-
// Matches dashed string for camelizing
rmsPrefix = /^-ms-/,
rdashAlpha = /-([\da-z])/gi,
@@ -495,33 +489,7 @@ jQuery.extend({
},
parseJSON: function( data ) {
- // Attempt to parse using the native JSON parser first
- if ( window.JSON && window.JSON.parse ) {
- return window.JSON.parse( data );
- }
-
- if ( data === null ) {
- return data;
- }
-
- if ( typeof data === "string" ) {
-
- // Make sure leading/trailing whitespace is removed (IE can't handle it)
- data = jQuery.trim( data );
-
- if ( data ) {
- // Make sure the incoming data is actual JSON
- // Logic borrowed from http://json.org/json2.js
- if ( rvalidchars.test( data.replace( rvalidescape, "@" )
- .replace( rvalidtokens, "]" )
- .replace( rvalidbraces, "")) ) {
-
- return ( new Function( "return " + data ) )();
- }
- }
- }
-
- jQuery.error( "Invalid JSON: " + data );
+ return window.JSON.parse( data );
},
// Cross-browser xml parsing