Roo/form/ComboNested.js

[roojs1] / roojs-ui-debug.js

diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js
index b22c951..8e8e6c9 100644 (file)
--- a/roojs-ui-debug.js
+++ b/roojs-ui-debug.js
@@ -784,6 +784,16 @@ Roo.extend(Roo.data.Store, Roo.util.Observable, {
         var r = this.reader.readRecords(o);
         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));
+    },
+    
 
     /**
      * Gets the number of cached records.
@@ -1980,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 };
        
     }
 });/*
@@ -2213,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;
        
     }
     
@@ -20383,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,
@@ -20497,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 : {});
@@ -20555,7 +20556,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
                     return false;
                 }
                 if (r.data.cn && r.data.cn.length) {
-                    cstore.loadData( r.data.cn);
+                    cstore.loadDataFromChildren( r);
                     var cret = _this.findRecordInStore(cstore, prop, value);
                     if (cret !== false) {
                         record = cret;