Do not add i-bem class to element with js

This reverts commit e4d41c4.
bem · Jan 28, 2015 · 3b06fd8 · 3b06fd8
1 parent 274aeeb
commit 3b06fd8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/lib/bh.js b/lib/bh.js
@@ -934,6 +934,8 @@ BH.prototype = {
                     }
                 }
 
+                var addJSInitClass = jsParams && !json.elem;
+
                 var mixes = json.mix;
                 if (mixes && mixes.length) {
                     for (i = 0, l = mixes.length; i < l; i++) {
@@ -948,14 +950,15 @@ BH.prototype = {
                                 if (mix.js) {
                                     (jsParams = jsParams || {})[mixBase] = mix.js === true ? {} : mix.js;
                                     hasMixJsParams = true;
+                                    if (!addJSInitClass) addJSInitClass = mixBlock && !mixElem;
                                 }
                             }
                         }
                     }
                 }
 
                 if (jsParams) {
-                    cls = cls + ' i-bem';
+                    if (addJSInitClass) cls += ' i-bem';
                     var jsData = (!hasMixJsParams && json.js === true ?
                         '{&quot;' + base + '&quot;:{}}' :
                         attrEscape(JSON.stringify(jsParams)));

diff --git a/test/test.js.js b/test/test.js.js
@@ -6,31 +6,36 @@ describe('ctx.js()', function() {
     beforeEach(function() {
         bh = new BH();
     });
+
     it('should return js', function() {
         bh.match('button', function(ctx) {
             ctx.js().should.equal(true);
         });
         bh.apply({ block: 'button', js: true });
     });
+
     it('should set js', function() {
         bh.match('button', function(ctx) {
             ctx.js(true);
         });
         bh.apply({ block: 'button' }).should.equal('<div class="button i-bem" onclick="return {&quot;button&quot;:{}}"></div>');
     });
+
     it('should not set js', function() {
         bh.match('button', function(ctx) {
             ctx.js(false);
         });
         bh.apply({ block: 'button' }).should.equal('<div class="button"></div>');
     });
+
     it('should extend user js', function() {
         bh.match('button', function(ctx) {
             ctx.js({ a: 2 });
         });
         bh.apply({ block: 'button', js: { x: 1 } })
             .should.equal('<div class="button i-bem" onclick="return {&quot;button&quot;:{&quot;x&quot;:1,&quot;a&quot;:2}}"></div>');
     });
+
     it('should not override later declarations', function() {
         bh.match('button', function(ctx) {
             ctx.js(false);
@@ -40,6 +45,7 @@ describe('ctx.js()', function() {
         });
         bh.apply({ block: 'button' }).should.equal('<div class="button i-bem" onclick="return {&quot;button&quot;:{}}"></div>');
     });
+
     it('should override later declarations with force flag', function() {
         bh.match('button', function(ctx) {
             ctx.js(true, true);
@@ -49,6 +55,7 @@ describe('ctx.js()', function() {
         });
         bh.apply({ block: 'button' }).should.equal('<div class="button i-bem" onclick="return {&quot;button&quot;:{}}"></div>');
     });
+
     it('should override user declarations with force flag', function() {
         bh.match('button', function(ctx) {
             ctx.js(false, true);

diff --git a/test/test.toHtml.js b/test/test.toHtml.js
@@ -252,13 +252,13 @@ describe('bh.toHtml()', function() {
         beforeEach(function() {
             bh = new BH();
         });
-        it('should set `i-bem` class on element', function() {
+        it('should not set `i-bem` class on element', function() {
             bh.apply({ block: 'button', elem: 'control', js: true, content: 'submit' }).should.equal(
-                '<div class="button__control i-bem" onclick="return {&quot;button__control&quot;:{}}">submit</div>');
+                '<div class="button__control" onclick="return {&quot;button__control&quot;:{}}">submit</div>');
         });
-        it('should set `i-bem` class on mixed element', function() {
+        it('should not set `i-bem` class on mixed element', function() {
             bh.apply({ block: 'icon', content: 'submit', mix: { block: 'button', elem: 'control', js: true } }).should.equal(
-                '<div class="icon button__control i-bem" onclick="return {&quot;button__control&quot;:{}}">submit</div>');
+                '<div class="icon button__control" onclick="return {&quot;button__control&quot;:{}}">submit</div>');
         });
     });