diff options
| author |   Dererk <dererk@satellogic.com> | 2016-11-15 14:18:53 -0300 |
|---|---|---|
| committer | Dererk <dererk@satellogic.com> | 2016-11-15 14:18:53 -0300 |
| commit | 1ad5102b7ddd181bb9c632b124d3ea4c7db28be6 (patch) | |
| tree | 73dda18465d0f4b8eb52d4482282a387c9f67c95 /bower_components/jquery/src/ajax/parseJSON.js | |
| parent | b67294f76809a681ff73f209ed691a3e3f00563d (diff) | |
| parent | ffb671c61a24a9086343b54bad080e145ff33fc5 (diff) | |
Merge tag 'upstream/7.8.1'
Upstream version 7.8.1
# gpg: Firmado el mar 15 nov 2016 14:18:48 ART
# gpg: usando RSA clave A6C7B88B9583046A11C5403E0B00FB6CEBE2D002
# gpg: Firma correcta de "Ulises Vitulli <dererk@debian.org>" [absoluta]
# gpg: alias "Dererk <dererk@torproject.org>" [absoluta]
# gpg: alias "Ulises Vitulli <uvitulli@fi.uba.ar>" [absoluta]
# gpg: alias "Ulises Vitulli <dererk@satellogic.com>" [absoluta]
Diffstat (limited to 'bower_components/jquery/src/ajax/parseJSON.js')
| -rw-r--r-- | bower_components/jquery/src/ajax/parseJSON.js | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/bower_components/jquery/src/ajax/parseJSON.js b/bower_components/jquery/src/ajax/parseJSON.js index 69b5c83..34efb79 100644 --- a/bower_components/jquery/src/ajax/parseJSON.js +++ b/bower_components/jquery/src/ajax/parseJSON.js @@ -1,12 +1,14 @@ -define([ +define( [ "../core" ], function( jQuery ) { var rvalidtokens = /(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g; jQuery.parseJSON = function( data ) { + // Attempt to parse using the native JSON parser first if ( window.JSON && window.JSON.parse ) { + // Support: Android 2.3 // Workaround failure to string-cast null input return window.JSON.parse( data + "" ); @@ -41,11 +43,11 @@ jQuery.parseJSON = function( data ) { // Remove this token return ""; - }) ) ? + } ) ) ? ( Function( "return " + str ) )() : jQuery.error( "Invalid JSON: " + data ); }; return jQuery.parseJSON; -}); +} ); |