From: Alan Knowles <alan@roojs.com>
Date: Fri, 28 Feb 2020 08:27:33 +0000 (+0800)
Subject: roojs-ui.js
X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=aec0da8b5f73a227fde318ff2ed385966f39a5c9

roojs-ui.js
roojs-ui-debug.js
roojs-all.js
roojs-debug.js
---

diff --git a/roojs-all.js b/roojs-all.js
index 1bf0d0ed59..24d93458a3 100644
--- a/roojs-all.js
+++ b/roojs-all.js
@@ -1775,7 +1775,7 @@ this.list.endUpdate();},onBeforeLoad:function(){if(!this.hasFocus){return;}this.
 this.setFromData(E.data);var lw=Math.floor(((this.listWidth*this.maxColumns||Math.max(this.wrap.getWidth(),this.minListWidth))-this.list.getFrameWidth('lr'))/this.maxColumns);this.stores[C.list+1].loadDataFromChildren(E);var dl=this.stores[C.list+1].getTotalCount();
 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){}
 },onDoubleClick:function(){this.collapse();},recordToStack:function(A,B,C,D){var E=new Roo.data.SimpleStore({reader:this.store.reader,data:[]});var F=this;var G=false;var H=false;if(A.getCount()<1){return false;}A.each(function(r){if(r.data[B]==C){G=r;H=r;
-return false;}if(r.data.cn&&r.data.cn.length){E.loadDataFromChildren(r);var I=F.recordToStack(E,B,C,D);if(I!==false){G=I;H=r;return false;}}return true;});if(G==false){return false}D.unshift(H);return G;},selectActive:function(){var A=[];this.recordToStack(this.store,this.hiddenName,this.getValue(),A);
+return false;}if(r.data.cn&&r.data.cn.length){E.loadDataFromChildren(r);var I=F.recordToStack(E,B,C,D);if(I!==false){G=I;H=r;return false;}}return true;});if(G==false){return false}D.unshift(H);return G;},selectActive:function(){var A=[];this.recordToStack(this.store,this.valueField,this.getValue(),A);
 for(var i=0;i<A.length;i++){this.view[i].select(A[i].store.indexOf(A[i]),false,false);}}});
 // 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"}
diff --git a/roojs-debug.js b/roojs-debug.js
index 90b7fb5a66..1f06594487 100644
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -43081,7 +43081,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
     {
 	// if store is not loaded, then we will need to wait for that to happen first.
         var stack = [];
-	this.recordToStack(this.store, this.hiddenName, this.getValue(), stack);
+	this.recordToStack(this.store, this.valueField, this.getValue(), stack);
 	for (var i = 0; i < stack.length; i++ ) {
 	    this.view[i].select(stack[i].store.indexOf(stack[i]), false, false );
 	}
diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js
index f19b9e2446..1390eb63e8 100644
--- a/roojs-ui-debug.js
+++ b/roojs-ui-debug.js
@@ -20597,7 +20597,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
     {
 	// if store is not loaded, then we will need to wait for that to happen first.
         var stack = [];
-	this.recordToStack(this.store, this.hiddenName, this.getValue(), stack);
+	this.recordToStack(this.store, this.valueField, this.getValue(), stack);
 	for (var i = 0; i < stack.length; i++ ) {
 	    this.view[i].select(stack[i].store.indexOf(stack[i]), false, false );
 	}
diff --git a/roojs-ui.js b/roojs-ui.js
index 1df130d601..154a7994cd 100644
--- a/roojs-ui.js
+++ b/roojs-ui.js
@@ -905,7 +905,7 @@ this.list.endUpdate();},onBeforeLoad:function(){if(!this.hasFocus){return;}this.
 this.setFromData(E.data);var lw=Math.floor(((this.listWidth*this.maxColumns||Math.max(this.wrap.getWidth(),this.minListWidth))-this.list.getFrameWidth('lr'))/this.maxColumns);this.stores[C.list+1].loadDataFromChildren(E);var dl=this.stores[C.list+1].getTotalCount();
 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){}
 },onDoubleClick:function(){this.collapse();},recordToStack:function(A,B,C,D){var E=new Roo.data.SimpleStore({reader:this.store.reader,data:[]});var F=this;var G=false;var H=false;if(A.getCount()<1){return false;}A.each(function(r){if(r.data[B]==C){G=r;H=r;
-return false;}if(r.data.cn&&r.data.cn.length){E.loadDataFromChildren(r);var I=F.recordToStack(E,B,C,D);if(I!==false){G=I;H=r;return false;}}return true;});if(G==false){return false}D.unshift(H);return G;},selectActive:function(){var A=[];this.recordToStack(this.store,this.hiddenName,this.getValue(),A);
+return false;}if(r.data.cn&&r.data.cn.length){E.loadDataFromChildren(r);var I=F.recordToStack(E,B,C,D);if(I!==false){G=I;H=r;return false;}}return true;});if(G==false){return false}D.unshift(H);return G;},selectActive:function(){var A=[];this.recordToStack(this.store,this.valueField,this.getValue(),A);
 for(var i=0;i<A.length;i++){this.view[i].select(A[i].store.indexOf(A[i]),false,false);}}});
 // 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"}