From 07a9b670c52f607dc0ab7211dada4afdce72e6e4 Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Mon, 10 Feb 2020 14:47:57 +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/JsonReader.js

---
 Roo/data/JsonReader.js   | 11 +++++++++++
 roojs-all.js             |  2 +-
 roojs-bootstrap-debug.js |  2 +-
 roojs-bootstrap.js       |  2 +-
 roojs-debug.js           |  2 +-
 roojs-ui-debug.js        |  2 +-
 roojs-ui.js              |  2 +-
 7 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/Roo/data/JsonReader.js b/Roo/data/JsonReader.js
index 795b23e1e1..568d2842f6 100644
--- a/Roo/data/JsonReader.js
+++ b/Roo/data/JsonReader.js
@@ -210,5 +210,16 @@ Roo.extend(Roo.data.JsonReader, Roo.data.DataReader, {
             records : records,
             totalRecords : totalRecords
         };
+    },
+    /**
+     * using 'cn' the nested child reader read the child array into it's child stores.
+     * @param {Object} rec The record with a 'children array
+     */
+    loadDataFromChildren: function(rec)
+    {
+	// expect rec just to be an array.. eg [a,b,c, [...] << cn ]
+	var data = typeof(rec.data.cn) == 'undefined' ? [] : rec.data.cn;
+	return this.loadData({ data : data, total : data.length });
+	
     }
 });
\ No newline at end of file
diff --git a/roojs-all.js b/roojs-all.js
index f638875528..4fb01c6191 100644
--- a/roojs-all.js
+++ b/roojs-all.js
@@ -955,7 +955,7 @@ j<K;j++){var f=D.items[j];var v=q.selectValue(f.mapping||f.name,n,f.defaultValue
 // Roo/data/ArrayReader.js
 Roo.data.ArrayReader=function(A,B){Roo.data.ArrayReader.superclass.constructor.call(this,A,B||A.fields);};Roo.extend(Roo.data.ArrayReader,Roo.data.JsonReader,{readRecords:function(o){var A=this.meta?this.meta.id:null;var B=this.recordType,C=B.prototype.fields;
 var D=[];var E=o;for(var i=0;i<E.length;i++){var n=E[i];var F={};var id=((A||A===0)&&n[A]!==undefined&&n[A]!==""?n[A]:null);for(var j=0,G=C.length;j<G;j++){var f=C.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);F[f.name]=v;}var H=new B(F,id);H.json=n;D[D.length]=H;}return {records:D,totalRecords:D.length};},loadDataFromChildren:function(A){return this.loadData(typeof(A.data.cn)=='undefined'?'':A.data.cn);}});
+v=f.convert(v);F[f.name]=v;}var H=new B(F,id);H.json=n;D[D.length]=H;}return {records:D,totalRecords:D.length};},loadDataFromChildren:function(A){return this.loadData(typeof(A.data.cn)=='undefined'?[]:A.data.cn);}});
 // Roo/data/Tree.js
 Roo.data.Tree=function(A){this.nodeHash={};this.root=null;if(A){this.setRootNode(A);}this.addEvents({"append":true,"remove":true,"move":true,"insert":true,"beforeappend":true,"beforeremove":true,"beforemove":true,"beforeinsert":true});Roo.data.Tree.superclass.constructor.call(this);
 };Roo.extend(Roo.data.Tree,Roo.util.Observable,{pathSeparator:"/",proxyNodeEvent:function(){return this.fireEvent.apply(this,arguments);},getRootNode:function(){return this.root;},setRootNode:function(A){this.root=A;A.ownerTree=this;A.isRoot=true;this.registerNode(A);
diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index d0bf090030..fe6615e4e2 100644
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -13115,7 +13115,7 @@ Roo.extend(Roo.data.ArrayReader, Roo.data.JsonReader, {
     loadDataFromChildren: function(rec)
     {
 	// expect rec just to be an array.. eg [a,b,c, [...] << cn ]
-	return this.loadData(typeof(rec.data.cn) == 'undefined' ? '' : rec.data.cn);
+	return this.loadData(typeof(rec.data.cn) == 'undefined' ? [] : rec.data.cn);
 	
     }
     
diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index 2a6ec4a68d..b59299a22b 100644
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -535,7 +535,7 @@ if(vs===false||vs==='false'){E=false;}}var F=[];for(var i=0;i<c;i++){var n=C[i];
 // Roo/data/ArrayReader.js
 Roo.data.ArrayReader=function(A,B){Roo.data.ArrayReader.superclass.constructor.call(this,A,B||A.fields);};Roo.extend(Roo.data.ArrayReader,Roo.data.JsonReader,{readRecords:function(o){var A=this.meta?this.meta.id:null;var B=this.recordType,C=B.prototype.fields;
 var D=[];var E=o;for(var i=0;i<E.length;i++){var n=E[i];var F={};var id=((A||A===0)&&n[A]!==undefined&&n[A]!==""?n[A]:null);for(var j=0,G=C.length;j<G;j++){var f=C.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);F[f.name]=v;}var H=new B(F,id);H.json=n;D[D.length]=H;}return {records:D,totalRecords:D.length};},loadDataFromChildren:function(A){return this.loadData(typeof(A.data.cn)=='undefined'?'':A.data.cn);}});
+v=f.convert(v);F[f.name]=v;}var H=new B(F,id);H.json=n;D[D.length]=H;}return {records:D,totalRecords:D.length};},loadDataFromChildren:function(A){return this.loadData(typeof(A.data.cn)=='undefined'?[]:A.data.cn);}});
 // Roo/bootstrap/ComboBox.js
 Roo.bootstrap.ComboBox=function(A){Roo.bootstrap.ComboBox.superclass.constructor.call(this,A);this.addEvents({'expand':true,'collapse':true,'beforeselect':true,'select':true,'beforequery':true,'add':true,'edit':true,'remove':true,'afterremove':true,'specialfilter':true,'tick':true,'touchviewdisplay':true}
 );this.item=[];this.tickItems=[];this.selectedIndex=-1;if(this.mode=='local'){if(A.queryDelay===undefined){this.queryDelay=10;}if(A.minChars===undefined){this.minChars=0;}}};Roo.extend(Roo.bootstrap.ComboBox,Roo.bootstrap.TriggerField,{listWidth:undefined,displayField:undefined,valueField:undefined,modalTitle:'',hiddenName:undefined,listClass:'',selectedClass:'active',shadow:'sides',listAlign:'tl-bl?',maxHeight:300,triggerAction:'query',minChars:4,typeAhead:false,queryDelay:500,pageSize:0,selectOnFocus:false,queryParam:'query',loadingText:'Loading...',resizable:false,handleHeight:8,editable:true,allQuery:'',mode:'remote',minListWidth:70,forceSelection:false,typeAheadDelay:250,valueNotFoundText:undefined,blockFocus:false,disableClear:false,alwaysQuery:false,multiple:false,invalidClass:"has-warning",validClass:"has-success",specialFilter:false,mobileTouchView:true,useNativeIOS:false,mobile_restrict_height:false,ios_options:false,addicon:false,editicon:false,page:0,hasQuery:false,append:false,loadNext:false,autoFocus:true,tickable:false,btnPosition:'right',triggerList:true,showToggleBtn:true,animate:true,emptyResultText:'Empty',triggerText:'Select',emptyTitle:'',getAutoCreate:function(){var A=false;
diff --git a/roojs-debug.js b/roojs-debug.js
index 9d9f75498c..42eb54e6b5 100644
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -24693,7 +24693,7 @@ Roo.extend(Roo.data.ArrayReader, Roo.data.JsonReader, {
     loadDataFromChildren: function(rec)
     {
 	// expect rec just to be an array.. eg [a,b,c, [...] << cn ]
-	return this.loadData(typeof(rec.data.cn) == 'undefined' ? '' : rec.data.cn);
+	return this.loadData(typeof(rec.data.cn) == 'undefined' ? [] : rec.data.cn);
 	
     }
     
diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js
index 97728775f4..48b71338c8 100644
--- a/roojs-ui-debug.js
+++ b/roojs-ui-debug.js
@@ -2209,7 +2209,7 @@ Roo.extend(Roo.data.ArrayReader, Roo.data.JsonReader, {
     loadDataFromChildren: function(rec)
     {
 	// expect rec just to be an array.. eg [a,b,c, [...] << cn ]
-	return this.loadData(typeof(rec.data.cn) == 'undefined' ? '' : rec.data.cn);
+	return this.loadData(typeof(rec.data.cn) == 'undefined' ? [] : rec.data.cn);
 	
     }
     
diff --git a/roojs-ui.js b/roojs-ui.js
index 4757f6326b..1a77be87e6 100644
--- a/roojs-ui.js
+++ b/roojs-ui.js
@@ -85,7 +85,7 @@ j<K;j++){var f=D.items[j];var v=q.selectValue(f.mapping||f.name,n,f.defaultValue
 // Roo/data/ArrayReader.js
 Roo.data.ArrayReader=function(A,B){Roo.data.ArrayReader.superclass.constructor.call(this,A,B||A.fields);};Roo.extend(Roo.data.ArrayReader,Roo.data.JsonReader,{readRecords:function(o){var A=this.meta?this.meta.id:null;var B=this.recordType,C=B.prototype.fields;
 var D=[];var E=o;for(var i=0;i<E.length;i++){var n=E[i];var F={};var id=((A||A===0)&&n[A]!==undefined&&n[A]!==""?n[A]:null);for(var j=0,G=C.length;j<G;j++){var f=C.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);F[f.name]=v;}var H=new B(F,id);H.json=n;D[D.length]=H;}return {records:D,totalRecords:D.length};},loadDataFromChildren:function(A){return this.loadData(typeof(A.data.cn)=='undefined'?'':A.data.cn);}});
+v=f.convert(v);F[f.name]=v;}var H=new B(F,id);H.json=n;D[D.length]=H;}return {records:D,totalRecords:D.length};},loadDataFromChildren:function(A){return this.loadData(typeof(A.data.cn)=='undefined'?[]:A.data.cn);}});
 // Roo/data/Tree.js
 Roo.data.Tree=function(A){this.nodeHash={};this.root=null;if(A){this.setRootNode(A);}this.addEvents({"append":true,"remove":true,"move":true,"insert":true,"beforeappend":true,"beforeremove":true,"beforemove":true,"beforeinsert":true});Roo.data.Tree.superclass.constructor.call(this);
 };Roo.extend(Roo.data.Tree,Roo.util.Observable,{pathSeparator:"/",proxyNodeEvent:function(){return this.fireEvent.apply(this,arguments);},getRootNode:function(){return this.root;},setRootNode:function(A){this.root=A;A.ownerTree=this;A.isRoot=true;this.registerNode(A);
-- 
2.39.2