From 3c1a5ee840a5efb5b2e3d47db83f0db55798dfb7 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Fri, 7 Feb 2020 11:10:51 +0800 Subject: [PATCH] roojs-ui.js roojs-ui-debug.js roojs-bootstrap.js roojs-bootstrap-debug.js roojs-all.js roojs-debug.js Roo/data/ArrayReader.js --- Roo/data/ArrayReader.js | 39 ++++++++++++++++++++------------------- roojs-bootstrap-debug.js | 12 ++++++------ roojs-debug.js | 12 ++++++------ roojs-ui-debug.js | 12 ++++++------ 4 files changed, 38 insertions(+), 37 deletions(-) diff --git a/Roo/data/ArrayReader.js b/Roo/data/ArrayReader.js index a147e0d273..463eac7d38 100644 --- a/Roo/data/ArrayReader.js +++ b/Roo/data/ArrayReader.js @@ -59,29 +59,30 @@ Roo.extend(Roo.data.ArrayReader, Roo.data.JsonReader, { * @return {Object} A data block which is used by an {@link Roo.data.Store} object as * a cache of Roo.data.Records. */ - readRecords : function(o){ + readRecords : function(o) + { var sid = this.meta ? this.meta.id : null; var recordType = this.recordType, fields = recordType.prototype.fields; var records = []; var root = 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 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 v = n[k] !== undefined ? n[k] : f.defaultValue; - v = f.convert(v); - values[f.name] = v; - } - var record = new recordType(values, id); - record.json = n; - records[records.length] = record; + 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 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 v = n[k] !== undefined ? n[k] : f.defaultValue; + v = f.convert(v); + values[f.name] = v; } - return { - records : records, - totalRecords : records.length - }; + var record = new recordType(values, id); + record.json = n; + records[records.length] = record; + } + return { + records : records, + totalRecords : records.length + }; } }); \ No newline at end of file diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index d4d6c1c3cb..2f9f0f4f15 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -13084,12 +13084,12 @@ Roo.extend(Roo.data.ArrayReader, Roo.data.JsonReader, { var values = {}; var 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 v = n[k] !== undefined ? n[k] : f.defaultValue; - v = f.convert(v); - values[f.name] = v; - } + var f = fields.items[j]; + var k = f.mapping !== undefined && f.mapping !== null ? f.mapping : j; + var v = n[k] !== undefined ? n[k] : f.defaultValue; + v = f.convert(v); + values[f.name] = v; + } var record = new recordType(values, id); record.json = n; records[records.length] = record; diff --git a/roojs-debug.js b/roojs-debug.js index eaaf822a6f..ee7780f35f 100644 --- a/roojs-debug.js +++ b/roojs-debug.js @@ -24628,12 +24628,12 @@ Roo.extend(Roo.data.ArrayReader, Roo.data.JsonReader, { var values = {}; var 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 v = n[k] !== undefined ? n[k] : f.defaultValue; - v = f.convert(v); - values[f.name] = v; - } + var f = fields.items[j]; + var k = f.mapping !== undefined && f.mapping !== null ? f.mapping : j; + var v = n[k] !== undefined ? n[k] : f.defaultValue; + v = f.convert(v); + values[f.name] = v; + } var record = new recordType(values, id); record.json = n; records[records.length] = record; diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js index ff33ad7e53..859326c00a 100644 --- a/roojs-ui-debug.js +++ b/roojs-ui-debug.js @@ -2175,12 +2175,12 @@ Roo.extend(Roo.data.ArrayReader, Roo.data.JsonReader, { var values = {}; var 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 v = n[k] !== undefined ? n[k] : f.defaultValue; - v = f.convert(v); - values[f.name] = v; - } + var f = fields.items[j]; + var k = f.mapping !== undefined && f.mapping !== null ? f.mapping : j; + var v = n[k] !== undefined ? n[k] : f.defaultValue; + v = f.convert(v); + values[f.name] = v; + } var record = new recordType(values, id); record.json = n; records[records.length] = record; -- 2.39.2