Upgrade to ExtJS 3.1.0 - Released 12/16/2009

[extjs.git] / docs / source / JSON.html
diff --git a/docs/source/JSON.html b/docs/source/JSON.html

index 704fbab..471eff5 100644 (file)
--- a/docs/source/JSON.html
+++ b/docs/source/JSON.html
@@ -1,5 +1,6 @@
  <html>\r
  <head>\r
  <html>\r
  <head>\r
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />    \r
    <title>The source code</title>\r
      <link href="../resources/prettify/prettify.css" type="text/css" rel="stylesheet" />\r
      <script type="text/javascript" src="../resources/prettify/prettify.js"></script>\r
    <title>The source code</title>\r
      <link href="../resources/prettify/prettify.css" type="text/css" rel="stylesheet" />\r
      <script type="text/javascript" src="../resources/prettify/prettify.js"></script>\r
@@ -32,35 +33,39 @@ Ext.util.JSON = new (function(){
              return eval("(" + json + ')');    
          },
          doEncode = function(o){
              return eval("(" + json + ')');    
          },
          doEncode = function(o){
-            if(typeof o == "undefined" || o === null){
+            if(!Ext.isDefined(o) || o === null){
                  return "null";
              }else if(Ext.isArray(o)){
                  return encodeArray(o);
                  return "null";
              }else if(Ext.isArray(o)){
                  return encodeArray(o);
-            }else if(Object.prototype.toString.apply(o) === '[object Date]'){
+            }else if(Ext.isDate(o)){
                  return Ext.util.JSON.encodeDate(o);
                  return Ext.util.JSON.encodeDate(o);
-            }else if(typeof o == "string"){
+            }else if(Ext.isString(o)){
                  return encodeString(o);
              }else if(typeof o == "number"){
                  return encodeString(o);
              }else if(typeof o == "number"){
+                //don't use isNumber here, since finite checks happen inside isNumber
                  return isFinite(o) ? String(o) : "null";
                  return isFinite(o) ? String(o) : "null";
-            }else if(typeof o == "boolean"){
+            }else if(Ext.isBoolean(o)){
                  return String(o);
              }else {
                  var a = ["{"], b, i, v;
                  for (i in o) {
                  return String(o);
              }else {
                  var a = ["{"], b, i, v;
                  for (i in o) {
-                    if(!useHasOwn || o.hasOwnProperty(i)) {
-                        v = o[i];
-                        switch (typeof v) {
-                        case "undefined":
-                        case "function":
-                        case "unknown":
-                            break;
-                        default:
-                            if(b){
-                                a.push(',');
+                    // don't encode DOM objects
+                    if(!o.getElementsByTagName){
+                        if(!useHasOwn || o.hasOwnProperty(i)) {
+                            v = o[i];
+                            switch (typeof v) {
+                            case "undefined":
+                            case "function":
+                            case "unknown":
+                                break;
+                            default:
+                                if(b){
+                                    a.push(',');
+                                }
+                                a.push(doEncode(i), ":",
+                                        v === null ? "null" : doEncode(v));
+                                b = true;
                              }
                              }
-                            a.push(doEncode(i), ":",
-                                    v === null ? "null" : doEncode(v));
-                            b = true;
                          }
                      }
                  }
                          }
                      }
                  }