X-Git-Url: http://git.ithinksw.org/extjs.git/blobdiff_plain/25ef3491bd9ae007ff1fc2b0d7943e6eaaccf775..6e39d509471fe9b4e2660e0d1631b350d0c66f40:/src/data/JsonWriter.js
diff --git a/src/data/JsonWriter.js b/src/data/JsonWriter.js
index 286d53dc..7e35f494 100644
--- a/src/data/JsonWriter.js
+++ b/src/data/JsonWriter.js
@@ -1,5 +1,5 @@
/*!
- * Ext JS Library 3.0.3
+ * Ext JS Library 3.1.0
* Copyright(c) 2006-2009 Ext JS, LLC
* licensing@extjs.com
* http://www.extjs.com/license
@@ -13,14 +13,14 @@ Ext.data.JsonWriter = function(config) {
Ext.data.JsonWriter.superclass.constructor.call(this, config);
// careful to respect "returnJson", renamed to "encode"
- // TODO: remove after v3 final release
+ // TODO: remove after Ext-3.0.1 release
if (this.returnJson != undefined) {
this.encode = this.returnJson;
}
}
Ext.extend(Ext.data.JsonWriter, Ext.data.DataWriter, {
/**
- * @cfg {Boolean} returnJson Deprecated. Use {@link Ext.data.JsonWriter#encode} instead.
+ * @cfg {Boolean} returnJson Deprecated, will be removed in Ext-3.0.1. Use {@link Ext.data.JsonWriter#encode} instead.
*/
returnJson : undefined,
/**
@@ -37,17 +37,20 @@ Ext.extend(Ext.data.JsonWriter, Ext.data.DataWriter, {
/**
* Final action of a write event. Apply the written data-object to params.
- * @param {String} action [Ext.data.Api.actions.create|read|update|destroy]
- * @param {Record[]} rs
- * @param {Object} http params
- * @param {Object} data object populated according to DataReader meta-data "root" and "idProperty"
+ * @param {Object} http params-object to write-to.
+ * @param {Object} baseParams as defined by {@link Ext.data.Store#baseParams}. The baseParms must be encoded by the extending class, eg: {@link Ext.data.JsonWriter}, {@link Ext.data.XmlWriter}.
+ * @param {Object/Object[]} data Data-object representing compiled Store-recordset.
*/
- render : function(action, rs, params, data) {
+ render : function(params, baseParams, data) {
if (this.encode === true) {
+ // Encode here now.
+ Ext.apply(params, baseParams);
params[this.meta.root] = Ext.encode(data);
} else {
- params.jsonData = {};
- params.jsonData[this.meta.root] = data;
+ // defer encoding for some other layer, probably in {@link Ext.Ajax#request}. Place everything into "jsonData" key.
+ var jdata = Ext.apply({}, baseParams);
+ jdata[this.meta.root] = data;
+ params.jsonData = jdata;
}
},
/**