Roo/form/ComboNested.js

[roojs1] / roojs-debug.js

diff --git a/roojs-debug.js b/roojs-debug.js
index f270701..d32eded 100644 (file)
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -23268,6 +23268,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.
@@ -24463,6 +24473,14 @@ Roo.extend(Roo.data.JsonReader, Roo.data.DataReader, {
             records : records,
             totalRecords : totalRecords
         };
+    },
+    // 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 { data : data, total : data.length };
+       
     }
 });/*
  * Based on:
@@ -24654,8 +24672,7 @@ Roo.data.ArrayReader = function(meta, recordType)
 
 Roo.extend(Roo.data.ArrayReader, Roo.data.JsonReader, {
     
-    readerType : 'Array',
-    /**
+      /**
      * Create a data block containing Roo.data.Records from an XML document.
      * @param {Object} o An Array of row objects which represents the dataset.
      * @return {Object} A data block which is used by an {@link Roo.data.Store} object as
@@ -24686,7 +24703,16 @@ Roo.extend(Roo.data.ArrayReader, Roo.data.JsonReader, {
            records : records,
            totalRecords : records.length
        };
+    },
+    // used when loading children.. @see loadDataFromChildren
+    toLoadData: function(rec)
+    {
+       // expect rec just to be an array.. eg [a,b,c, [...] << cn ]
+       return typeof(rec.data.cn) == 'undefined' ? [] : rec.data.cn;
+       
     }
+    
+    
 });/*
  * Based on:
  * Ext JS Library 1.1.1
@@ -42845,9 +42871,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
             });
         }
         this.stores[i]  = store;
-                
-        
-        
+                  
         var view = this.views[i] = new Roo.View(
             il,
             this.tpl,
@@ -42959,8 +42983,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 : {});
@@ -42970,23 +42993,32 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
         if (!ix.length) {
             this.setFromData({});
             var str = this.stores[opts.list+1];
-            str.loadData( str.reader.readerType == 'json' ? { data : [] } : [] );
+            str.removeAll();
             return;
         }
         
         var rec = view.store.getAt(ix[0]);
-        this.setFromData(rec.data);
+        if (!this.isLoading) {
+            this.setFromData(rec.data);
+        }
+        
         
         var lw = Math.floor(
                 ((this.listWidth * this.maxColumns || Math.max(this.wrap.getWidth(), this.minListWidth)) - this.list.getFrameWidth('lr')) / this.maxColumns
         );
-        var data =  typeof(rec.data.cn) == 'undefined' ? [] : rec.data.cn;
-        var dl = typeof(data.data) != 'undefined' ? data.total : data.length; ///json is a nested response..
-        this.stores[opts.list+1].loadData( data );
+        
+        this.stores[opts.list+1].loadDataFromChildren( rec );
+        var dl = this.stores[opts.list+1]. getTotalCount();
         this.views[opts.list+1].getEl().setHeight( this.innerLists[0].getHeight());
         this.views[opts.list+1].getEl().setStyle({ display : dl ? 'block' : 'none' });
         this.innerLists[opts.list+1].setHeight( this.innerLists[0].getHeight());
-        this.list.setWidth(lw * (opts.list + (dl ? 2 : 1))); 
+        this.list.setWidth(lw * (opts.list + (dl ? 2 : 1)));
+        
+        if (this.isLoading) {
+            this.selectActive(opts.list);
+        }
+        
+        
     },
     onDoubleClick : function()
     {
@@ -43000,7 +43032,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
         return this.findRecordInStore(this.store, prop,value);
     },
     
-     // private
+    // private
     findRecordInStore : function(store, prop, value)
     {
         var cstore = new Roo.data.SimpleStore({
@@ -43017,7 +43049,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;
@@ -43029,7 +43061,9 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
             });
         }
         return record;
-    }
+    },
+    
+    function selectActive()