Roo/form/ComboNested.js

[roojs1] / Roo / form / ComboNested.js

diff --git a/Roo/form/ComboNested.js b/Roo/form/ComboNested.js
index 04b3171..dc266a1 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;
         }
@@ -313,8 +312,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
         if (this.isLoading) {
             this.selectActive(opts.list);
         }
-        
-        
+         
     },
     onDoubleClick : function()
     {
@@ -325,11 +323,12 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
     
     findRecord : function (prop,value)
     {
-        return this.findRecordInStore(this.store, 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
@@ -348,7 +347,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
             }
             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;
                     return false;
@@ -357,11 +356,18 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
              
             return true;
         });
-        
+        if (record == false) {
+           return false
+       }
+       stack.unshift(store, record);
         return record;
     },
     
-    
+    /*
+     * find the stack of stores that match our value.
+     *
+     * 
+     */
     
     selectActive : function (lvl)
     {
@@ -371,35 +377,39 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
             data : [ ]
         });
         // 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 false;
+            return;
         }
-        var record = false;
+        var value = this.getValue();
+        var prop = this.hiddenName;
+        
+        var _this = this;
         store.each(function(r){
             // selected is at this level
             if(r.data[prop] == value){
-                record = r;
+                var ix = store.getIndexOf(r);
+                _this.views[lvl].select(ix, false, true); // do not trigger set active..
+                _this.loading 
                 return false;
             }
             
             if (r.data.cn && r.data.cn.length) {
-                cstore.loadDataFromChildren( r);
+                cstore.loadDataFromChildren(r);
                 var cret = _this.findRecordInStore(cstore, prop, value);
                 if (cret !== false) {
                     var ix = store.getIndexOf(r);
-                    this.views[lvl].select(ix, false, true); // will not trigger select change..
-                    this.store.loadDataFromChildren(r); // will trigger load.
-                    this.selectActive(lvl+1);
+                    _this.views[lvl].select(ix, false, false); // will trigger select change..
                     return false;
                 }
             }
              
             return true;
         });
-         
+        
     }