Skip to content

i-bem.bemhtml: Do not repeat block class on mix with same block's mod #626

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
mshustov wants to merge 2 commits into
base: support/2.x
Choose a base branch
from
Open

i-bem.bemhtml: Do not repeat block class on mix with same block's mod #626

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
809292f
i-bem__html: Support mix of elem with same block
tadatuta Feb 10, 2015
8e877d7
Add some tests and little fixes
Mar 30, 2015
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
6 changes: 3 additions & 3 deletions blocks-common/i-bem/__html/i-bem__html.bemhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,13 +388,13 @@ default: {
var mixItem = mix[i];

if (!mixItem) continue;

var hasItem = mixItem.block || mixItem.elem,
var hasItem = (mixItem.block && (this.block !== v.block || mixItem.block !== this.block))
|| (this.elem && (!mixItem.elemMods && !mixItem.mods))
|| mixItem.elem ,
Copy link
Copy Markdown
Member

@tadatuta tadatuta Mar 30, 2015

Choose a reason for hiding this comment

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

extra space before ,

block = mixItem.block || mixItem._block || this.block,
elem = mixItem.elem || mixItem._elem || this.elem,
mods = mixItem.mods || this.mods,
elemMods = mixItem.elemMods || {};

hasItem && buf.push(' ');
BEM_.INTERNAL[hasItem? 'buildClasses' : 'buildModsClasses'](
block,
Expand Down
Empty file added blocks-common/i-bem/__html/test/files/i-bem/gh-core-804.bemhtml
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions blocks-common/i-bem/__html/test/files/i-bem/gh-core-804.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<div class="b1 b1_m1_v1"></div><div class="b1 b1_m1_v1"></div><div class="b1 b2 b2_m1_v1"></div><div class="b1__e1 b1"></div><div class="b2 b1__e1"></div><div class="b1 b1__e1"></div><div class="b1__e1 b1__e1_m1_v1"></div><div class="b1__e1 b1__e1_m1_v1"></div><div class="b1__e1 b1__e2 b1__e2_m2_v2"></div><div class="b1__e1 b1__e1_m1_v1 b1__e2 b1__e2_m2_v2"></div><div class="b1__e1 b1__e1_m1_v1 b1__e2"></div>
60 changes: 60 additions & 0 deletions blocks-common/i-bem/__html/test/files/i-bem/gh-core-804.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
[
{
"block": "b1",
"mix": {
"block": "b1",
"mods": { "m1": "v1" }
}
},
{
"block": "b1",
"mix": {"mods": {"m1": "v1"}}
},
{
"block": "b1",
"mix": {
"block": "b2",
"mods": { "m1": "v1" }
}
},
{
"block": "b1",
"elem": "e1",
"mix": [{ "block": "b1" }]
},
{
"block": "b2",
"mix": [{ "block": "b1", "elem": "e1" }]
},
{
"block": "b1",
"mix": {"elem": "e1"}
},
{
"block": "b1",
"elem": "e1",
"mix": {"elemMods": {"m1": "v1"}}
},
{
"block": "b1",
"elem": "e1",
"mix": {"mods": {"m1": "v1"}}
},
{
"block": "b1",
"elem": "e1",
"mix": {"elem": "e2", "elemMods": {"m2": "v2"}}
},
{
"block": "b1",
"elem": "e1",
"elemMods": {"m1": "v1"},
"mix": {"elem": "e2", "elemMods": {"m2": "v2"}}
},
{
"block": "b1",
"elem": "e1",
"elemMods": {"m1": "v1"},
"mix": {"elem": "e2"}
}
]
1 change: 1 addition & 0 deletions blocks-common/i-bem/__html/test/i-bem-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ suite('i-bem block and others', function() {
unit('simple types regression #254', 'gh-254');
unit('applyNext in content regression #289', 'gh-289');
unit('mods redefinition #550', 'gh-550');
unit('mix elem on same block', 'gh-core-804');
unit('block with escaping this', 'escaping-this');

test('re-entrance', function() {
Expand Down