Skip to content

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

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

Closed
tadatuta wants to merge 2 commits into from
Closed

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

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
f1773f7
i-bem.bemhtml: Do not repeat block class on mix with same block's mod
tadatuta Feb 10, 2015
708f5d3
i-bem__html: Support mix of elem with same block
tadatuta Feb 10, 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
2 changes: 1 addition & 1 deletion 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 @@ -389,7 +389,7 @@ default: {

if (!mixItem) continue;

var hasItem = mixItem.block || mixItem.elem,
var hasItem = (mixItem.block && (this.block !== v.block || mixItem.block !== this.block)) || this.elem || mixItem.elem,
block = mixItem.block || mixItem._block || this.block,
elem = mixItem.elem || mixItem._elem || this.elem,
mods = mixItem.mods || this.mods,
Expand Down
1 change: 1 addition & 0 deletions blocks-common/i-bem/__html/test/files/i-bem/gh-core-804.bemhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
block b1, mix: { block: 'b2' }
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 b2 b1_m1_v1"></div><div class="b1__e1 b1"></div><div class="b1 b2 b1__e1"></div>
18 changes: 18 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,18 @@
[
{
"block": "b1",
"mix": {
"block": "b1",
"mods": { "m1": "v1" }
}
},
{
"block": "b1",
"elem": "e1",
"mix": [{ "block": "b1" }]
},
{
"block": "b1",
"mix": [{ "block": "b1", "elem": "e1" }]
}
]
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 @@ -48,6 +48,7 @@ suite('i-bem block and others', function() {
unit('applyNext in content regression #289', 'gh-289');
unit('mods redefinition #550', 'gh-550');
unit('block with escaping this', 'escaping-this');
unit('mix with same block bem-core/804', 'gh-core-804');

test('re-entrance', function() {
var t = bemhtml.compile(iBem + readFile('i-bem/re-entrant.bemhtml'));
Expand Down