From 01c4756fe9ccb058ab44867088e3a65266779d45 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 10 Feb 2020 15:58:27 +0800 Subject: [PATCH] roojs-ui.js roojs-ui-debug.js roojs-all.js roojs-debug.js --- roojs-all.js | 2 +- roojs-debug.js | 8 ++------ roojs-ui-debug.js | 8 ++------ roojs-ui.js | 2 +- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/roojs-all.js b/roojs-all.js index 33405f1c67..6fde255b9a 100644 --- a/roojs-all.js +++ b/roojs-all.js @@ -1777,7 +1777,7 @@ this.views[C.list+1].getEl().setHeight(this.innerLists[0].getHeight());this.view }},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,true);this.store.loadDataFromChildren(r);this.selectActive(A+1);return false;}}return true;});}}); +if(G!==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 f260457e25..dac42269e2 100644 --- a/roojs-debug.js +++ b/roojs-debug.js @@ -42985,7 +42985,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; } @@ -43017,8 +43016,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, { if (this.isLoading) { this.selectActive(opts.list); } - - + }, onDoubleClick : function() { @@ -43094,9 +43092,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, { 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; } } diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js index 16738eb0a1..e570a16096 100644 --- a/roojs-ui-debug.js +++ b/roojs-ui-debug.js @@ -20501,7 +20501,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; } @@ -20533,8 +20532,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, { if (this.isLoading) { this.selectActive(opts.list); } - - + }, onDoubleClick : function() { @@ -20610,9 +20608,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, { 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; } } diff --git a/roojs-ui.js b/roojs-ui.js index 49703b65ab..108f94f029 100644 --- a/roojs-ui.js +++ b/roojs-ui.js @@ -907,7 +907,7 @@ this.views[C.list+1].getEl().setHeight(this.innerLists[0].getHeight());this.view }},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,true);this.store.loadDataFromChildren(r);this.selectActive(A+1);return false;}}return true;});}}); +if(G!==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); -- 2.39.2