roojs-ui.js

[roojs1] / Roo / form / ComboNested.js

diff --git a/Roo/form/ComboNested.js b/Roo/form/ComboNested.js
index db50667..916c410 100644 (file)
--- a/Roo/form/ComboNested.js
+++ b/Roo/form/ComboNested.js
@@ -281,7 +281,6 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
         var ix = view.getSelectedIndexes();
          
         if (opts.list > this.maxColumns - 2) {
-             
             this.setFromData(ix.length ? view.store.getAt(ix[0]).data : {});
             return;
         }
@@ -294,9 +293,9 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
         }
         
         var rec = view.store.getAt(ix[0]);
-        if (!this.isLoading) {
-            this.setFromData(rec.data);
-        }
+         
+        this.setFromData(rec.data);
+        
         
         
         var lw = Math.floor(
@@ -311,10 +310,9 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
         this.list.setWidth(lw * (opts.list + (dl ? 2 : 1)));
         
         if (this.isLoading) {
-            this.selectActive(opts.list);
+           // this.selectActive(opts.list);
         }
-        
-        
+         
     },
     onDoubleClick : function()
     {
@@ -323,13 +321,10 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
     
      
     
-    findRecord : function (prop,value)
-    {
-        return this.findRecordInStore(this.store, prop,value);
-    },
+    
     
     // private
-    findRecordInStore : function(store, prop, value)
+    recordToStores : function(store, prop, value, stack)
     {
         var cstore = new Roo.data.SimpleStore({
             //fields : this.store.reader.meta.fields, // we need array reader.. for
@@ -338,58 +333,51 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
         });
         var _this = this;
         var record  = false;
+       var srec = false;
         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) {
+            if(r.data[prop] == value){
+                record = r;
+               srec = r;
+                return false;
+            }
+            if (r.data.cn && r.data.cn.length) {
                 cstore.loadDataFromChildren( r);
-                var cret = _this.findRecordInStore(cstore, prop, value);
+                var cret = _this.recordToStores(cstore, prop, value, stack);
                 if (cret !== false) {
                     record = cret;
+                   srec = r;
                     return false;
                 }
-             }
+            }
              
-             return true;
+            return true;
         });
-        
+        if (record == false) {
+           return false
+       }
+       stack.unshift(srec);
         return record;
     },
     
+    /*
+     * find the stack of stores that match our value.
+     *
+     * 
+     */
     
-    
-    selectActive : function (lvl)
+    selectActive : function ()
     {
-        // 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;
-        });
-        
+       // if store is not loaded, then we will need to wait for that to happen first.
+        var stack = [];
+       this.findRecordInStore(this.store, this.hiddenName, this.getValue(), stack);
+       
+       
     }
+       
+