Skip to content

Правка небольших багов radio #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jerry-ok wants to merge 2 commits into
base: v2.0.0
Choose a base branch
from
Open

Правка небольших багов radio #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
188ce26
Не у всех контролов есть Label (radio, checkbox)
Jerry-ok Mar 8, 2017
80c6f86
У каждой radio из radio-group может быть свой модификатор disabled
Jerry-ok Mar 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common.blocks/form-field/form-field.browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Copy link
Member

@belozer belozer Oct 27, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Meybe

var label = this.findChildBlock(Label);
label && label.setMod(modName, modVal);

?

this.getControl().setMod(modName, modVal);
}
},
Expand Down
2 changes: 1 addition & 1 deletion common.blocks/radio/radio.bemhtml.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
})
Expand Down