X-Git-Url: http://git.roojs.org/?p=roojs1;a=blobdiff_plain;f=roojs-bootstrap-debug.js;h=0ab5de6302732f1f5dafbe963d6e092917fe4def;hp=2d38483bf53948a2275ba859aa2458fff05abc3b;hb=refs%2Fheads%2Fwip_alan_T6201_Category_select;hpb=0022ffeeb325affebe362db53c64c45361197f0b diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 2d38483bf5..0ab5de6302 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -11832,7 +11832,7 @@ Roo.extend(Roo.data.Store, Roo.util.Observable, { */ loadDataFromChildren : function(rec) { - + this.loadData(this.reader.toLoadData(rec)); }, @@ -13031,15 +13031,12 @@ Roo.extend(Roo.data.JsonReader, Roo.data.DataReader, { 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) + // used when loading children.. @see loadDataFromChildren + toLoadData: 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 }); + return { data : data, total : data.length }; } });/* @@ -13129,14 +13126,11 @@ Roo.extend(Roo.data.ArrayReader, Roo.data.JsonReader, { totalRecords : records.length }; }, - /** - * 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) + // used when loading children.. @see loadDataFromChildren + toLoadData: 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 typeof(rec.data.cn) == 'undefined' ? [] : rec.data.cn; }