From: Alan Knowles <alan@roojs.com>
Date: Mon, 10 Feb 2020 07:59:13 +0000 (+0800)
Subject: roojs-ui.js
X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=e71859824639daf59d75a6602ef0023a1b96bbab

roojs-ui.js
roojs-ui-debug.js
roojs-all.js
roojs-debug.js
Roo/form/ComboNested.js
---

diff --git a/Roo/form/ComboNested.js b/Roo/form/ComboNested.js
index 07dcb310b6..b7aa8e5b09 100644
--- a/Roo/form/ComboNested.js
+++ b/Roo/form/ComboNested.js
@@ -380,7 +380,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
             // selected is at this level
             if(r.data[prop] == value){
                 var ix = store.getIndexOf(r);
-                this.views[lvl].select(ix, false, true);
+                this.views[lvl].select(ix, false, true); // do not trigger set active..
                 return false;
             }
             
diff --git a/roojs-all.js b/roojs-all.js
index 6fde255b9a..1d1bc770f5 100644
--- a/roojs-all.js
+++ b/roojs-all.js
@@ -1776,8 +1776,8 @@ if(!this.isLoading){this.setFromData(E.data);}var lw=Math.floor(((this.listWidth
 this.views[C.list+1].getEl().setHeight(this.innerLists[0].getHeight());this.views[C.list+1].getEl().setStyle({display:dl?'block':'none'});this.innerLists[C.list+1].setHeight(this.innerLists[0].getHeight());this.list.setWidth(lw*(C.list+(dl?2:1)));if(this.isLoading){this.selectActive(C.list);
 }},onDoubleClick:function(){this.collapse();},findRecord:function(A,B){return this.findRecordInStore(this.store,A,B);},findRecordInStore:function(A,B,C){var D=new Roo.data.SimpleStore({reader:this.store.reader,data:[]});var E=this;var F=false;if(A.getCount()<1){return false;
 }A.each(function(r){if(r.data[B]==C){F=r;return false;}if(r.data.cn&&r.data.cn.length){D.loadDataFromChildren(r);var G=E.findRecordInStore(D,B,C);if(G!==false){F=G;return false;}}return true;});return F;},selectActive:function(A){var B=new Roo.data.SimpleStore({reader:this.store.reader,data:[]}
-);var C=this.getValue();var D=this.hiddenName;var E=this.stores[A];if(E.getCount()<1){return;}var F=false;E.each(function(r){if(r.data[D]==C){F=r;return false;}if(r.data.cn&&r.data.cn.length){B.loadDataFromChildren(r);var G=_this.findRecordInStore(B,D,C);
-if(G!==false){var ix=E.getIndexOf(r);this.views[A].select(ix,false,false);return false;}}return true;});}});
+);var C=this.getValue();var D=this.hiddenName;var E=this.stores[A];if(E.getCount()<1){return;}E.each(function(r){if(r.data[D]==C){var ix=E.getIndexOf(r);this.views[A].select(ix,false,true);return false;}if(r.data.cn&&r.data.cn.length){B.loadDataFromChildren(r);
+var F=_this.findRecordInStore(B,D,C);if(F!==false){var ix=E.getIndexOf(r);this.views[A].select(ix,false,false);return false;}}return true;});}});
 // Roo/form/Checkbox.js
 Roo.form.Checkbox=function(A){Roo.form.Checkbox.superclass.constructor.call(this,A);this.addEvents({check:true});};Roo.extend(Roo.form.Checkbox,Roo.form.Field,{focusClass:undefined,fieldClass:"x-form-field",checked:false,defaultAutoCreate:{tag:"input",type:'hidden',autocomplete:"off"}
 ,boxLabel:"",inputValue:'1',valueOff:'0',actionMode:'viewEl',itemCls:'x-menu-check-item x-form-item',groupClass:'x-menu-group-item',inputType:'hidden',inSetChecked:false,inputElement:false,basedOn:false,isFormField:true,onResize:function(){Roo.form.Checkbox.superclass.onResize.apply(this,arguments);
diff --git a/roojs-debug.js b/roojs-debug.js
index dac42269e2..1680bd0a69 100644
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -43079,16 +43079,17 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
         if(store.getCount() < 1){
             return;
         }
-        var record = false;
+        
         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);
                 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);
diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js
index e570a16096..929f084a97 100644
--- a/roojs-ui-debug.js
+++ b/roojs-ui-debug.js
@@ -20595,16 +20595,17 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
         if(store.getCount() < 1){
             return;
         }
-        var record = false;
+        
         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);
                 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);
diff --git a/roojs-ui.js b/roojs-ui.js
index 108f94f029..5b763f3f12 100644
--- a/roojs-ui.js
+++ b/roojs-ui.js
@@ -906,8 +906,8 @@ if(!this.isLoading){this.setFromData(E.data);}var lw=Math.floor(((this.listWidth
 this.views[C.list+1].getEl().setHeight(this.innerLists[0].getHeight());this.views[C.list+1].getEl().setStyle({display:dl?'block':'none'});this.innerLists[C.list+1].setHeight(this.innerLists[0].getHeight());this.list.setWidth(lw*(C.list+(dl?2:1)));if(this.isLoading){this.selectActive(C.list);
 }},onDoubleClick:function(){this.collapse();},findRecord:function(A,B){return this.findRecordInStore(this.store,A,B);},findRecordInStore:function(A,B,C){var D=new Roo.data.SimpleStore({reader:this.store.reader,data:[]});var E=this;var F=false;if(A.getCount()<1){return false;
 }A.each(function(r){if(r.data[B]==C){F=r;return false;}if(r.data.cn&&r.data.cn.length){D.loadDataFromChildren(r);var G=E.findRecordInStore(D,B,C);if(G!==false){F=G;return false;}}return true;});return F;},selectActive:function(A){var B=new Roo.data.SimpleStore({reader:this.store.reader,data:[]}
-);var C=this.getValue();var D=this.hiddenName;var E=this.stores[A];if(E.getCount()<1){return;}var F=false;E.each(function(r){if(r.data[D]==C){F=r;return false;}if(r.data.cn&&r.data.cn.length){B.loadDataFromChildren(r);var G=_this.findRecordInStore(B,D,C);
-if(G!==false){var ix=E.getIndexOf(r);this.views[A].select(ix,false,false);return false;}}return true;});}});
+);var C=this.getValue();var D=this.hiddenName;var E=this.stores[A];if(E.getCount()<1){return;}E.each(function(r){if(r.data[D]==C){var ix=E.getIndexOf(r);this.views[A].select(ix,false,true);return false;}if(r.data.cn&&r.data.cn.length){B.loadDataFromChildren(r);
+var F=_this.findRecordInStore(B,D,C);if(F!==false){var ix=E.getIndexOf(r);this.views[A].select(ix,false,false);return false;}}return true;});}});
 // Roo/form/Checkbox.js
 Roo.form.Checkbox=function(A){Roo.form.Checkbox.superclass.constructor.call(this,A);this.addEvents({check:true});};Roo.extend(Roo.form.Checkbox,Roo.form.Field,{focusClass:undefined,fieldClass:"x-form-field",checked:false,defaultAutoCreate:{tag:"input",type:'hidden',autocomplete:"off"}
 ,boxLabel:"",inputValue:'1',valueOff:'0',actionMode:'viewEl',itemCls:'x-menu-check-item x-form-item',groupClass:'x-menu-group-item',inputType:'hidden',inSetChecked:false,inputElement:false,basedOn:false,isFormField:true,onResize:function(){Roo.form.Checkbox.superclass.onResize.apply(this,arguments);