Roo/form/ComboNested.js

[roojs1] / roojs-ui-debug.js

diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js
index 9d30942..1356457 100644 (file)
--- a/roojs-ui-debug.js
+++ b/roojs-ui-debug.js
@@ -1990,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 };
        
     }
 });/*
@@ -2223,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;
        
     }
     
@@ -20393,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,
@@ -20507,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 : {});
@@ -20523,7 +20514,10 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
         }
         
         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
@@ -20534,7 +20528,13 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
         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()
     {
@@ -20558,25 +20558,57 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
         });
         var _this = this;
         var record  = false;
-        if(store.getCount() > 0){
-           store.each(function(r){
-                if(r.data[prop] == value){
-                    record = r;
+        if(store.getCount() < 1){
+            return false;
+        }
+        store.each(function(r){
+            if(r.data[prop] == value){
+                record = r;
+                return false;
+            }
+            if (r.data.cn && r.data.cn.length) {
+                cstore.loadDataFromChildren( r);
+                var cret = _this.findRecordInStore(cstore, prop, value);
+                if (cret !== false) {
+                    record = cret;
                     return false;
                 }
-                if (r.data.cn && r.data.cn.length) {
-                    cstore.loadDataFromChildren( r);
-                    var cret = _this.findRecordInStore(cstore, prop, value);
-                    if (cret !== false) {
-                        record = cret;
-                        return false;
-                    }
-                }
-                
-                return true;
-            });
-        }
+            }
+             
+            return true;
+        });
+        
         return record;
+    },
+    
+    
+    
+    selectActive : function (lvl)
+    {
+        // just need to determine which of the current level is selected if any..
+        var value = this.getValue();
+        var prop = this.hiddenName;
+        var store = this.stores[lvl];
+        if(store.getCount() < 1){
+            return;
+        }
+        store.each(function(r){
+            if(r.data[prop] == value){
+                 record = r;
+                 return false;
+            }
+             if (r.data.cn && r.data.cn.length) {
+                 cstore.loadDataFromChildren( r);
+                 var cret = _this.findRecordInStore(cstore, prop, value);
+                 if (cret !== false) {
+                     record = cret;
+                     return false;
+                 }
+             }
+             
+             return true;
+        });
+        
     }