From d36c6c0a6a6b8c4894d0c0bb28feacd611de2a88 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 10 Feb 2020 15:56:41 +0800 Subject: [PATCH] roojs-ui.js roojs-ui-debug.js roojs-all.js roojs-debug.js --- roojs-all.js | 2 +- roojs-debug.js | 4 ++-- roojs-ui-debug.js | 4 ++-- roojs-ui.js | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/roojs-all.js b/roojs-all.js index b03c62b77a..33405f1c67 100644 --- a/roojs-all.js +++ b/roojs-all.js @@ -1776,7 +1776,7 @@ 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 false;}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); +);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,true);this.store.loadDataFromChildren(r);this.selectActive(A+1);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"} diff --git a/roojs-debug.js b/roojs-debug.js index ae94324a2d..f260457e25 100644 --- a/roojs-debug.js +++ b/roojs-debug.js @@ -43079,7 +43079,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, { var prop = this.hiddenName; var store = this.stores[lvl]; if(store.getCount() < 1){ - return false; + return; } var record = false; store.each(function(r){ @@ -43103,7 +43103,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, { return true; }); - + } diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js index 72e4eeb94c..16738eb0a1 100644 --- a/roojs-ui-debug.js +++ b/roojs-ui-debug.js @@ -20595,7 +20595,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, { var prop = this.hiddenName; var store = this.stores[lvl]; if(store.getCount() < 1){ - return false; + return; } var record = false; store.each(function(r){ @@ -20619,7 +20619,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, { return true; }); - + } diff --git a/roojs-ui.js b/roojs-ui.js index fcb749642d..49703b65ab 100644 --- a/roojs-ui.js +++ b/roojs-ui.js @@ -906,7 +906,7 @@ 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 false;}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); +);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,true);this.store.loadDataFromChildren(r);this.selectActive(A+1);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"} -- 2.39.2