From e03d7b1d8fa731f8f94e12dae4ae59f63d7e72d4 Mon Sep 17 00:00:00 2001 From: Alan Date: Fri, 23 Sep 2022 11:27:00 +0800 Subject: [PATCH] roojs-ui.js roojs-ui-debug.js roojs-all.js roojs-debug.js --- roojs-all.js | 4 ++-- roojs-debug.js | 11 +++-------- roojs-ui-debug.js | 11 +++-------- roojs-ui.js | 4 ++-- 4 files changed, 10 insertions(+), 20 deletions(-) diff --git a/roojs-all.js b/roojs-all.js index d6ff716bcd..439fe1c2c5 100644 --- a/roojs-all.js +++ b/roojs-all.js @@ -1852,8 +1852,8 @@ this.el.on('DOMAttrModified',this.setFromHidden,this);this.el.on('propertychange // Roo/form/Radio.js Roo.form.Radio=function(){Roo.form.Radio.superclass.constructor.apply(this,arguments);};Roo.extend(Roo.form.Radio,Roo.form.Checkbox,{inputType:'radio',getGroupValue:function(){return this.el.up('form').child('input[name='+this.el.dom.name+']:checked',true).value; },onRender:function(ct,A){Roo.form.Checkbox.superclass.onRender.call(this,ct,A);if(this.inputValue!==undefined){this.el.dom.value=this.inputValue;}this.wrap=this.el.wrap({cls:"x-form-check-wrap"});if(this.boxLabel){this.wrap.createChild({tag:'label',htmlFor:this.el.id,cls:'x-form-cb-label',html:this.boxLabel} -);}if(this.checked){this.el.dom.checked='checked';}},setValue:function(v,A){this.setChecked(String(v)===String(this.inputValue),A);this.inSetChecked=true;this.el.dom.form[this.name]=v;this.inSetChecked=false;},setChecked:function(A,B){if(this.inSetChecked){this.checked=A; -return;}if(this.wrap){this.wrap[A?'addClass':'removeClass']('x-menu-item-checked');}this.checked=A;if(B!==true){this.fireEvent('check',this,A);}}}); +);}if(this.checked){this.el.dom.checked='checked';}},setValue:function(v,A){this.setChecked(String(v)===String(this.inputValue),A);this.el.dom.form[this.name]=v;},setChecked:function(A,B){if(this.wrap){this.wrap[A?'addClass':'removeClass']('x-menu-item-checked'); +}this.checked=A;if(B!==true){this.fireEvent('check',this,A);}}}); // Roo/rtf/namespace.js Roo.rtf={}; // Roo/rtf/Hex.js diff --git a/roojs-debug.js b/roojs-debug.js index 3ab75596d9..f6c412ff35 100644 --- a/roojs-debug.js +++ b/roojs-debug.js @@ -45134,20 +45134,15 @@ Roo.extend(Roo.form.Radio, Roo.form.Checkbox, { // this.el.dom.defaultChecked = this.checked; //} this.setChecked(String(v) === String(this.inputValue), suppressEvent); - this.inSetChecked = true; + this.el.dom.form[this.name] = v; - this.inSetChecked = false; + //this.fireEvent("check", this, this.checked); }, // private.. setChecked : function(state,suppressEvent) { - if (this.inSetChecked) { - this.checked = state; - return; - } - - + if(this.wrap){ this.wrap[state ? 'addClass' : 'removeClass']('x-menu-item-checked'); } diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js index 95fb95b53b..adda2311ec 100644 --- a/roojs-ui-debug.js +++ b/roojs-ui-debug.js @@ -20635,20 +20635,15 @@ Roo.extend(Roo.form.Radio, Roo.form.Checkbox, { // this.el.dom.defaultChecked = this.checked; //} this.setChecked(String(v) === String(this.inputValue), suppressEvent); - this.inSetChecked = true; + this.el.dom.form[this.name] = v; - this.inSetChecked = false; + //this.fireEvent("check", this, this.checked); }, // private.. setChecked : function(state,suppressEvent) { - if (this.inSetChecked) { - this.checked = state; - return; - } - - + if(this.wrap){ this.wrap[state ? 'addClass' : 'removeClass']('x-menu-item-checked'); } diff --git a/roojs-ui.js b/roojs-ui.js index b47d962061..015156e5de 100644 --- a/roojs-ui.js +++ b/roojs-ui.js @@ -905,8 +905,8 @@ this.el.on('DOMAttrModified',this.setFromHidden,this);this.el.on('propertychange // Roo/form/Radio.js Roo.form.Radio=function(){Roo.form.Radio.superclass.constructor.apply(this,arguments);};Roo.extend(Roo.form.Radio,Roo.form.Checkbox,{inputType:'radio',getGroupValue:function(){return this.el.up('form').child('input[name='+this.el.dom.name+']:checked',true).value; },onRender:function(ct,A){Roo.form.Checkbox.superclass.onRender.call(this,ct,A);if(this.inputValue!==undefined){this.el.dom.value=this.inputValue;}this.wrap=this.el.wrap({cls:"x-form-check-wrap"});if(this.boxLabel){this.wrap.createChild({tag:'label',htmlFor:this.el.id,cls:'x-form-cb-label',html:this.boxLabel} -);}if(this.checked){this.el.dom.checked='checked';}},setValue:function(v,A){this.setChecked(String(v)===String(this.inputValue),A);this.inSetChecked=true;this.el.dom.form[this.name]=v;this.inSetChecked=false;},setChecked:function(A,B){if(this.inSetChecked){this.checked=A; -return;}if(this.wrap){this.wrap[A?'addClass':'removeClass']('x-menu-item-checked');}this.checked=A;if(B!==true){this.fireEvent('check',this,A);}}}); +);}if(this.checked){this.el.dom.checked='checked';}},setValue:function(v,A){this.setChecked(String(v)===String(this.inputValue),A);this.el.dom.form[this.name]=v;},setChecked:function(A,B){if(this.wrap){this.wrap[A?'addClass':'removeClass']('x-menu-item-checked'); +}this.checked=A;if(B!==true){this.fireEvent('check',this,A);}}}); // Roo/rtf/namespace.js Roo.rtf={}; // Roo/rtf/Hex.js -- 2.39.2