From 188ce26adcd99e7e2605867373d332d0dd068d6d Mon Sep 17 00:00:00 2001 From: Jerry_mouse Date: Wed, 8 Mar 2017 17:11:50 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=9D=D0=B5=20=D1=83=20=D0=B2=D1=81=D0=B5?= =?UTF-8?q?=D1=85=20=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=BE=D0=BB=D0=BE=D0=B2?= =?UTF-8?q?=20=D0=B5=D1=81=D1=82=D1=8C=20Label=20(radio,=20checkbox)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common.blocks/form-field/form-field.browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.blocks/form-field/form-field.browser.js b/common.blocks/form-field/form-field.browser.js index 3cb9eab..a0b2465 100644 --- a/common.blocks/form-field/form-field.browser.js +++ b/common.blocks/form-field/form-field.browser.js @@ -24,7 +24,7 @@ provide(bemDom.declBlock(this.name, /** @lends form-field.prototype */{ }, 'disabled' : function(modName, modVal) { - this.findChildBlock(Label).setMod(modName, modVal); + this.findChildBlock(Label) && this.findChildBlock(Label).setMod(modName, modVal); this.getControl().setMod(modName, modVal); } }, From 80c6f86a07cba97aaaf8b7f944842e46a815b72c Mon Sep 17 00:00:00 2001 From: Jerry_mouse Date: Wed, 8 Mar 2017 17:34:41 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=A3=20=D0=BA=D0=B0=D0=B6=D0=B4=D0=BE?= =?UTF-8?q?=D0=B9=20radio=20=D0=B8=D0=B7=20radio-group=20=D0=BC=D0=BE?= =?UTF-8?q?=D0=B6=D0=B5=D1=82=20=D0=B1=D1=8B=D1=82=D1=8C=20=D1=81=D0=B2?= =?UTF-8?q?=D0=BE=D0=B9=20=D0=BC=D0=BE=D0=B4=D0=B8=D1=84=D0=B8=D0=BA=D0=B0?= =?UTF-8?q?=D1=82=D0=BE=D1=80=20disabled?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common.blocks/radio/radio.bemhtml.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.blocks/radio/radio.bemhtml.js b/common.blocks/radio/radio.bemhtml.js index fbd6278..2ae4962 100644 --- a/common.blocks/radio/radio.bemhtml.js +++ b/common.blocks/radio/radio.bemhtml.js @@ -4,7 +4,7 @@ block('radio')( var ctx = this.ctx; ctx.name || (ctx.name = this._form_field.name); - this.mods.disabled = this._form_field.mods.disabled; + this.mods.disabled = this._form_field.mods.disabled || this.mods.disabled; return applyNext(); })