projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4f0bcce
)
Roo/util/JSON.js
author
Alan Knowles
<alan@akbkhome.com>
Tue, 19 Oct 2010 03:13:23 +0000
(11:13 +0800)
committer
Alan Knowles
<alan@akbkhome.com>
Tue, 19 Oct 2010 03:13:23 +0000
(11:13 +0800)
Roo/util/JSON.js
patch
|
blob
|
history
diff --git
a/Roo/util/JSON.js
b/Roo/util/JSON.js
index
7cc9006
..
0b7ab0d
100644
(file)
--- a/
Roo/util/JSON.js
+++ b/
Roo/util/JSON.js
@@
-131,7
+131,7
@@
Roo.util.JSON = new (function(){
*/
this.decode = function(json){
- return /** eval:var:json */ eval("(" + json + ')');
+ return
JSON && JSON.parse ? JSON.parse(json) :
/** eval:var:json */ eval("(" + json + ')');
};
})();
/**