git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'useragent'
[jquery.git]
/
src
/
ajax.js
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" ) {
// 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 );
data = JSON.parse( data );
- } else {
+
+ } catch(e) {
data = (new Function("return " + data))();
}
}
data = (new Function("return " + data))();
}
}