From dea0a4697bbc5b633dcb3b4bd9cc257b29825d36 Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Mon, 10 Feb 2020 12:39:18 +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/SimpleStore.js

---
 roojs-all.js             |  4 ++--
 roojs-bootstrap-debug.js | 11 ++++++-----
 roojs-bootstrap.js       |  4 ++--
 roojs-debug.js           |  2 +-
 roojs-ui-debug.js        |  2 +-
 roojs-ui.js              |  4 ++--
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/roojs-all.js b/roojs-all.js
index 65026a4424..ecc0516245 100644
--- a/roojs-all.js
+++ b/roojs-all.js
@@ -907,8 +907,8 @@ this.fireEvent("update",this,A,Roo.data.Record.COMMIT);},commitChanges:function(
 i<A;i++){m[i].reject();}},onMetaChange:function(A,B,o){this.recordType=B;this.fields=B.prototype.fields;delete this.snapshot;this.sortInfo=A.sortInfo||this.sortInfo;this.modified=[];this.fireEvent('metachange',this,this.reader.meta);},moveIndex:function(A,B){var C=this.indexOf(A);
 var D=C+B;this.remove(A);this.insert(D,A);}});
 // Roo/data/SimpleStore.js
-Roo.data.SimpleStore=function(A){Roo.data.SimpleStore.superclass.constructor.call(this,{isLocal:true,reader:typeof(A.reader)!='undefined'?A.reader:new Roo.data.ArrayReader({id:A.id,fields:A.fields},Roo.data.Record.create(A.fields)),proxy:new Roo.data.MemoryProxy(A.data)}
-);this.load();};Roo.extend(Roo.data.SimpleStore,Roo.data.Store);
+Roo.data.SimpleStore=function(A){Roo.data.SimpleStore.superclass.constructor.call(this,{isLocal:true,reader:new Roo.data.ArrayReader({id:A.id,fields:A.fields},Roo.data.Record.create(A.fields)),proxy:new Roo.data.MemoryProxy(A.data)});this.load();};Roo.extend(Roo.data.SimpleStore,Roo.data.Store);
+
 // Roo/data/JsonStore.js
 Roo.data.JsonStore=function(c){Roo.data.JsonStore.superclass.constructor.call(this,Roo.apply(c,{proxy:!c.data?new Roo.data.HttpProxy({url:c.url}):undefined,reader:new Roo.data.JsonReader(c,c.fields)}));};Roo.extend(Roo.data.JsonStore,Roo.data.Store);
 // Roo/data/Field.js
diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index a517377b5f..8145ac6955 100644
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -12138,8 +12138,9 @@ Roo.data.SimpleStore = function(config)
 {
     Roo.data.SimpleStore.superclass.constructor.call(this, {
         isLocal : true,
-        reader: typeof(config.reader) != 'undefined' ? config.reader : new Roo.data.ArrayReader({
-                id: config.id
+        reader:  new Roo.data.ArrayReader({
+                id: config.id,
+                fields : config.fields
             },
             Roo.data.Record.create(config.fields)
         ),
@@ -12335,6 +12336,7 @@ Roo.data.DataReader.prototype = {
         return new this.recordType(Roo.apply(da, d));
     }
     
+    
 };/*
  * Based on:
  * Ext JS Library 1.1.1
@@ -13063,9 +13065,8 @@ var myReader = new Roo.data.ArrayReader({
  * 
  * created using {@link Roo.data.Record#create}.
  */
-Roo.data.ArrayReader = function(meta, recordType){
-    
-     
+Roo.data.ArrayReader = function(meta, recordType)
+{    
     Roo.data.ArrayReader.superclass.constructor.call(this, meta, recordType||meta.fields);
 };
 
diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index a14c386465..a322657da8 100644
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -492,8 +492,8 @@ this.fireEvent("update",this,A,Roo.data.Record.COMMIT);},commitChanges:function(
 i<A;i++){m[i].reject();}},onMetaChange:function(A,B,o){this.recordType=B;this.fields=B.prototype.fields;delete this.snapshot;this.sortInfo=A.sortInfo||this.sortInfo;this.modified=[];this.fireEvent('metachange',this,this.reader.meta);},moveIndex:function(A,B){var C=this.indexOf(A);
 var D=C+B;this.remove(A);this.insert(D,A);}});
 // Roo/data/SimpleStore.js
-Roo.data.SimpleStore=function(A){Roo.data.SimpleStore.superclass.constructor.call(this,{isLocal:true,reader:typeof(A.reader)!='undefined'?A.reader:new Roo.data.ArrayReader({id:A.id},Roo.data.Record.create(A.fields)),proxy:new Roo.data.MemoryProxy(A.data)});
-this.load();};Roo.extend(Roo.data.SimpleStore,Roo.data.Store);
+Roo.data.SimpleStore=function(A){Roo.data.SimpleStore.superclass.constructor.call(this,{isLocal:true,reader:new Roo.data.ArrayReader({id:A.id,fields:A.fields},Roo.data.Record.create(A.fields)),proxy:new Roo.data.MemoryProxy(A.data)});this.load();};Roo.extend(Roo.data.SimpleStore,Roo.data.Store);
+
 // Roo/data/JsonStore.js
 Roo.data.JsonStore=function(c){Roo.data.JsonStore.superclass.constructor.call(this,Roo.apply(c,{proxy:!c.data?new Roo.data.HttpProxy({url:c.url}):undefined,reader:new Roo.data.JsonReader(c,c.fields)}));};Roo.extend(Roo.data.JsonStore,Roo.data.Store);
 // Roo/data/Field.js
diff --git a/roojs-debug.js b/roojs-debug.js
index ce0b6decd3..2d95489a91 100644
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -23581,7 +23581,7 @@ Roo.data.SimpleStore = function(config)
 {
     Roo.data.SimpleStore.superclass.constructor.call(this, {
         isLocal : true,
-        reader: typeof(config.reader) != 'undefined' ? config.reader : new Roo.data.ArrayReader({
+        reader:  new Roo.data.ArrayReader({
                 id: config.id,
                 fields : config.fields
             },
diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js
index 8203e65f67..eb00367719 100644
--- a/roojs-ui-debug.js
+++ b/roojs-ui-debug.js
@@ -1097,7 +1097,7 @@ Roo.data.SimpleStore = function(config)
 {
     Roo.data.SimpleStore.superclass.constructor.call(this, {
         isLocal : true,
-        reader: typeof(config.reader) != 'undefined' ? config.reader : new Roo.data.ArrayReader({
+        reader:  new Roo.data.ArrayReader({
                 id: config.id,
                 fields : config.fields
             },
diff --git a/roojs-ui.js b/roojs-ui.js
index 8f5a71a89d..ab6efcddec 100644
--- a/roojs-ui.js
+++ b/roojs-ui.js
@@ -37,8 +37,8 @@ this.fireEvent("update",this,A,Roo.data.Record.COMMIT);},commitChanges:function(
 i<A;i++){m[i].reject();}},onMetaChange:function(A,B,o){this.recordType=B;this.fields=B.prototype.fields;delete this.snapshot;this.sortInfo=A.sortInfo||this.sortInfo;this.modified=[];this.fireEvent('metachange',this,this.reader.meta);},moveIndex:function(A,B){var C=this.indexOf(A);
 var D=C+B;this.remove(A);this.insert(D,A);}});
 // Roo/data/SimpleStore.js
-Roo.data.SimpleStore=function(A){Roo.data.SimpleStore.superclass.constructor.call(this,{isLocal:true,reader:typeof(A.reader)!='undefined'?A.reader:new Roo.data.ArrayReader({id:A.id,fields:A.fields},Roo.data.Record.create(A.fields)),proxy:new Roo.data.MemoryProxy(A.data)}
-);this.load();};Roo.extend(Roo.data.SimpleStore,Roo.data.Store);
+Roo.data.SimpleStore=function(A){Roo.data.SimpleStore.superclass.constructor.call(this,{isLocal:true,reader:new Roo.data.ArrayReader({id:A.id,fields:A.fields},Roo.data.Record.create(A.fields)),proxy:new Roo.data.MemoryProxy(A.data)});this.load();};Roo.extend(Roo.data.SimpleStore,Roo.data.Store);
+
 // Roo/data/JsonStore.js
 Roo.data.JsonStore=function(c){Roo.data.JsonStore.superclass.constructor.call(this,Roo.apply(c,{proxy:!c.data?new Roo.data.HttpProxy({url:c.url}):undefined,reader:new Roo.data.JsonReader(c,c.fields)}));};Roo.extend(Roo.data.JsonStore,Roo.data.Store);
 // Roo/data/Field.js
-- 
2.39.2