roojs-core.js

[roojs1] / Roo / util / JSON.js

diff --git a/Roo/util/JSON.js b/Roo/util/JSON.js
index 9507f74..4bcd691 100644 (file)
--- a/Roo/util/JSON.js
+++ b/Roo/util/JSON.js
@@ -13,7 +13,7 @@
  * Modified version of Douglas Crockford"s json.js that doesn"t
  * mess with the Object prototype 
  * http://www.json.org/js.html
- * @singleton
+ * @static
  */
 Roo.util.JSON = new (function(){
     var useHasOwn = {}.hasOwnProperty ? true : false;
@@ -89,9 +89,6 @@ Roo.util.JSON = new (function(){
     this.encode = function(o)
     {
         // should this be extended to fully wrap stringify..
-        if (JSON && JSON.stringify) {
-            return JSON.stringify(o);
-        }
         
         if(typeof o == "undefined" || o === null){
             return "null";
@@ -137,16 +134,16 @@ Roo.util.JSON = new (function(){
      */
     this.decode = function(json){
         
-        return JSON && JSON.parse ? JSON.parse(json) : /** eval:var:json */ eval("(" + json + ')');
+        return  /** eval:var:json */ eval("(" + json + ')');
     };
 })();
 /** 
  * Shorthand for {@link Roo.util.JSON#encode}
  * @member Roo encode 
  * @method */
-Roo.encode = Roo.util.JSON.encode;
+Roo.encode = typeof(JSON) != 'undefined' && JSON.stringify ? JSON.stringify : Roo.util.JSON.encode;
 /** 
  * Shorthand for {@link Roo.util.JSON#decode}
  * @member Roo decode 
  * @method */
-Roo.decode = Roo.util.JSON.decode;
+Roo.decode = typeof(JSON) != 'undefined' && JSON.parse ? JSON.parse : Roo.util.JSON.decode;