git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
ffb1867
)
Merge branch 'useragent'
author
jeresig
<jeresig@gmail.com>
Wed, 6 Jan 2010 00:10:42 +0000
(19:10 -0500)
committer
jeresig
<jeresig@gmail.com>
Wed, 6 Jan 2010 00:10:42 +0000
(19:10 -0500)
src/ajax.js
patch
|
blob
|
history
diff --git
a/src/ajax.js
b/src/ajax.js
index
b5adf2c
..
91519d2
100644
(file)
--- a/
src/ajax.js
+++ b/
src/ajax.js
@@
-579,9
+579,11
@@
jQuery.extend({
// Get the JavaScript object, if JSON is used.
if ( type === "json" ) {
- if ( typeof JSON === "object" && JSON.parse ) {
+ // Try to use the native JSON parser first
+ try {
data = JSON.parse( data );
- } else {
+
+ } catch(e) {
data = (new Function("return " + data))();
}
}