git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c68fbc2
)
Back out the try/catch logic from around JSON.parse. We should always try to use...
author
jeresig
<jeresig@gmail.com>
Thu, 7 Jan 2010 16:54:26 +0000
(11:54 -0500)
committer
jeresig
<jeresig@gmail.com>
Thu, 7 Jan 2010 16:54:26 +0000
(11:54 -0500)
src/ajax.js
patch
|
blob
|
history
diff --git
a/src/ajax.js
b/src/ajax.js
index
35d83e4
..
9b8e800
100644
(file)
--- a/
src/ajax.js
+++ b/
src/ajax.js
@@
-578,10
+578,10
@@
jQuery.extend({
// Get the JavaScript object, if JSON is used.
if ( type === "json" || !type && ct.indexOf("json") >= 0 ) {
// Try to use the native JSON parser first
- try {
- data = JSON.parse( data );
+ if ( window.JSON && window.JSON.parse ) {
+ data = window.JSON.parse( data );
- } catch(e) {
+ } else {
data = (new Function("return " + data))();
}
}