X-Git-Url: http://git.ithinksw.org/extjs.git/blobdiff_plain/3789b528d8dd8aad4558e38e22d775bcab1cbd36..refs/heads/master:/docs/source/JSON3.html?ds=inline diff --git a/docs/source/JSON3.html b/docs/source/JSON3.html index e9b6b510..d726c140 100644 --- a/docs/source/JSON3.html +++ b/docs/source/JSON3.html @@ -3,8 +3,8 @@
/** * @class Ext.JSON - * Modified version of Douglas Crockford"s json.js that doesn"t + * Modified version of Douglas Crockford's JSON.js that doesn't * mess with the Object prototype * http://www.json.org/js.html * @singleton @@ -110,15 +110,15 @@ Ext.JSON = new(function() { * <b>The returned value includes enclosing double quotation marks.</b></p> * <p>The default return format is "yyyy-mm-ddThh:mm:ss".</p> * <p>To override this:</p><pre><code> - Ext.JSON.encodeDate = function(d) { - return d.format('"Y-m-d"'); - }; +Ext.JSON.encodeDate = function(d) { + return Ext.Date.format(d, '"Y-m-d"'); +}; </code></pre> * @param {Date} d The Date to encode * @return {String} The string literal to use in a JSON string. */ this.encodeDate = function(o) { - return '"' + o.getFullYear() + "-" + return '"' + o.getFullYear() + "-" + pad(o.getMonth() + 1) + "-" + pad(o.getDate()) + "T" + pad(o.getHours()) + ":" @@ -128,7 +128,7 @@ Ext.JSON = new(function() { /** * Encodes an Object, Array or other value - * @param {Mixed} o The variable to encode + * @param {Object} o The variable to encode * @return {String} The JSON string */ this.encode = function() { @@ -165,7 +165,7 @@ Ext.JSON = new(function() { Ext.Error.raise({ sourceClass: "Ext.JSON", sourceMethod: "decode", - msg: "You're trying to decode and invalid JSON String: " + json + msg: "You're trying to decode an invalid JSON String: " + json }); } }; @@ -174,19 +174,16 @@ Ext.JSON = new(function() { })(); /** * Shorthand for {@link Ext.JSON#encode} - * @param {Mixed} o The variable to encode - * @return {String} The JSON string * @member Ext * @method encode + * @alias Ext.JSON#encode */ Ext.encode = Ext.JSON.encode; /** * Shorthand for {@link Ext.JSON#decode} - * @param {String} json The JSON string - * @param {Boolean} safe (optional) Whether to return null or throw an exception if the JSON is invalid. - * @return {Object} The resulting object * @member Ext * @method decode + * @alias Ext.JSON#decode */ Ext.decode = Ext.JSON.decode;