Roo/form/ComboNested.js

[roojs1] / roojs-ui-debug.js

diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js
index 0fd6b72..8e8e6c9 100644 (file)
--- a/roojs-ui-debug.js
+++ b/roojs-ui-debug.js
@@ -785,10 +785,13 @@ Roo.extend(Roo.data.Store, Roo.util.Observable, {
         this.loadRecords(r, {add: append}, true);
     },
     
-    
+     /**
+     * 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)
     {
-        
+        this.loadData(this.reader.toLoadData(rec));
     },
     
 
@@ -1987,15 +1990,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 };
        
     }
 });/*
@@ -2220,14 +2220,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;
        
     }
     
@@ -20390,9 +20387,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
             });
         }
         this.stores[i]  = store;
-                
-        
-        
+                  
         var view = this.views[i] = new Roo.View(
             il,
             this.tpl,
@@ -20504,8 +20499,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
     onSelectChange : function (view, sels, opts )
     {
         var ix = view.getSelectedIndexes();
-        
-        
+         
         if (opts.list > this.maxColumns - 2) {
              
             this.setFromData(ix.length ? view.store.getAt(ix[0]).data : {});