X-Git-Url: http://git.ithinksw.org/extjs.git/blobdiff_plain/25ef3491bd9ae007ff1fc2b0d7943e6eaaccf775..c8256059947f3aa8f5b0a9a2acf55e2142bb4742:/docs/source/JsonReader.html diff --git a/docs/source/JsonReader.html b/docs/source/JsonReader.html index 097b4a11..ae7c6f94 100644 --- a/docs/source/JsonReader.html +++ b/docs/source/JsonReader.html @@ -1,13 +1,14 @@ + The source code
/*!
- * Ext JS Library 3.0.3
- * Copyright(c) 2006-2009 Ext JS, LLC
+ * Ext JS Library 3.2.1
+ * Copyright(c) 2006-2010 Ext JS, Inc.
  * licensing@extjs.com
  * http://www.extjs.com/license
  */
@@ -172,13 +173,16 @@ Ext.extend(Ext.data.JsonReader, Ext.data.DataReader, {
         return this.readRecords(o);
     },
 
-    
/** - * Decode a json response from server. - * @param {String} action [Ext.data.Api.actions.create|read|update|destroy] - * @param {Object} response + /* * TODO: refactor code between JsonReader#readRecords, #readResponse into 1 method. * there's ugly duplication going on due to maintaining backwards compat. with 2.0. It's time to do this. */ +
/** + * Decode a JSON response from server. + * @param {String} action [Ext.data.Api.actions.create|read|update|destroy] + * @param {Object} response The XHR object returned through an Ajax server request. + * @return {Response} A {@link Ext.data.Response Response} object containing the data response, and also status information. + */ readResponse : function(action, response) { var o = (response.responseText !== undefined) ? Ext.decode(response.responseText) : response; if(!o) { @@ -200,7 +204,7 @@ Ext.extend(Ext.data.JsonReader, Ext.data.DataReader, { var res = new Ext.data.Response({ action: action, success: this.getSuccess(o), - data: this.extractData(root), + data: (root) ? this.extractData(root, false) : [], message: this.getMessage(o), raw: o }); @@ -305,50 +309,22 @@ Ext.extend(Ext.data.JsonReader, Ext.data.DataReader, { createAccessor : function(){ var re = /[\[\.]/; return function(expr) { - try { - return(re.test(expr)) ? - new Function('obj', 'return obj.' + expr) : - function(obj){ - return obj[expr]; - }; - } catch(e){} - return Ext.emptyFn; - }; - }(), - - /** - * returns extracted, type-cast rows of data. Iterates to call #extractValues for each row - * @param {Object[]/Object} data-root from server response - * @param {Boolean} returnRecords [false] Set true to return instances of Ext.data.Record - * @private - */ - extractData : function(root, returnRecords) { - var rs = undefined; - if (this.isData(root)) { - root = [root]; - } - if (Ext.isArray(root)) { - var f = this.recordType.prototype.fields, - fi = f.items, - fl = f.length, - rs = []; - if (returnRecords === true) { - var Record = this.recordType; - for (var i = 0; i < root.length; i++) { - var n = root[i]; - var record = new Record(this.extractValues(n, fi, fl), this.getId(n)); - record.json = n; - rs.push(record); - } + if(Ext.isEmpty(expr)){ + return Ext.emptyFn; } - else { - for (var i = 0; i < root.length; i++) { - rs.push(this.extractValues(root[i], fi, fl)); - } + if(Ext.isFunction(expr)){ + return expr; } - } - return rs; - }, + var i = String(expr).search(re); + if(i >= 0){ + return new Function('obj', 'return obj' + (i > 0 ? '.' : '') + expr); + } + return function(obj){ + return obj[expr]; + }; + + }; + }(), /** * type-casts a single row of raw-data from server @@ -388,6 +364,6 @@ Ext.apply(Ext.data.JsonReader.Error.prototype, { 'root-empty': 'Data was expected to be returned by the server in the "root" property of the response. Please review your JsonReader configuration to ensure the "root" property matches that returned in the server-response. See JsonReader docs.' } }); -
+ \ No newline at end of file