X-Git-Url: http://git.ithinksw.org/extjs.git/blobdiff_plain/c930e9176a5a85509c5b0230e2bff5c22a591432..6e39d509471fe9b4e2660e0d1631b350d0c66f40:/src/data/ArrayReader.js diff --git a/src/data/ArrayReader.js b/src/data/ArrayReader.js index 613041a4..57193627 100644 --- a/src/data/ArrayReader.js +++ b/src/data/ArrayReader.js @@ -1,5 +1,5 @@ /*! - * Ext JS Library 3.0.0 + * Ext JS Library 3.1.0 * Copyright(c) 2006-2009 Ext JS, LLC * licensing@extjs.com * http://www.extjs.com/license @@ -55,27 +55,20 @@ Ext.data.ArrayReader = Ext.extend(Ext.data.JsonReader, { this.arrayData = o; var s = this.meta, sid = s ? Ext.num(s.idIndex, s.id) : null, - recordType = this.recordType, + recordType = this.recordType, fields = recordType.prototype.fields, records = [], v; - if(!this.getRoot) { - this.getRoot = s.root ? this.getJsonAccessor(s.root) : function(p) {return p;}; - if(s.totalProperty) { - this.getTotal = this.getJsonAccessor(s.totalProperty); - } - } - var root = this.getRoot(o); - for(var i = 0; i < root.length; i++) { - var n = root[i]; - var values = {}; - var id = ((sid || sid === 0) && n[sid] !== undefined && n[sid] !== "" ? n[sid] : null); + for(var i = 0, len = root.length; i < len; i++) { + var n = root[i], + values = {}, + id = ((sid || sid === 0) && n[sid] !== undefined && n[sid] !== "" ? n[sid] : null); for(var j = 0, jlen = fields.length; j < jlen; j++) { - var f = fields.items[j]; - var k = f.mapping !== undefined && f.mapping !== null ? f.mapping : j; + var f = fields.items[j], + k = f.mapping !== undefined && f.mapping !== null ? f.mapping : j; v = n[k] !== undefined ? n[k] : f.defaultValue; v = f.convert(v, n); values[f.name] = v;