BEMHTML: fix render i-bem when mix elem with js (fix #441)

bem · Apr 28, 2017 · 808469f · 808469f
1 parent 8afc310
commit 808469f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/lib/bemhtml/index.js b/lib/bemhtml/index.js
@@ -234,7 +234,9 @@ BEMHTML.prototype.renderMix = function(entity, mix, jsParams, addJSInitClass) {
       js[classBuilder.build(block, item.elem)] =
           item.js === true ? {} : item.js;
       if (!addInit)
-        addInit = block && !item.elem;
+        addInit = this._elemJsInstances ?
+          (item.elem || block) :
+          (block && !item.elem);
     }
 
     // Process nested mixes

diff --git a/test/bemjson-js-test.js b/test/bemjson-js-test.js
@@ -119,4 +119,17 @@ describe('BEMJSON js', function() {
         ' data-bem=\'{"b__e":{},"a":{}}\'></div>');
     });
   });
+
+  it('should render i-bem when mixed with elem with js', function() {
+    compile(function() {}, { elemJsInstances: true })
+      .apply({
+        block: 'b',
+        content: {
+          elem: 'e1',
+          mix: { elem: 'e2', js: true }
+        }
+      })
+      .should.equal('<div class="b"><div class="b__e1 b__e2 i-bem" ' +
+                    'data-bem=\'{"b__e2":{}}\'></div></div>');
+  });
 });