Add support for modVal : '*' in declMod (closes #1374)

bem · Jun 20, 2016 · 36b2061 · 36b2061
1 parent 44c1c9a
commit 36b2061
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/common.blocks/i-bem/i-bem.spec.js b/common.blocks/i-bem/i-bem.spec.js
@@ -202,6 +202,32 @@ describe('i-bem', function() {
             baseMethodSpy.should.have.been.calledOnce;
             modsMethodSpy.should.have.been.calledOnce;
         });
+
+        it('should apply method if block has any mod', function() {
+            var baseMethodSpy = sinon.spy(),
+                modsMethodSpy = sinon.spy(),
+                Block = bem
+                    .declBlock('block', { method : baseMethodSpy })
+                    .declMod({ modName : 'mod1', modVal : '*' }, { method : modsMethodSpy }),
+                instance = new Block({ mod1 : 'val1' });
+
+            instance.method();
+
+            baseMethodSpy.should.not.have.been.called;
+            modsMethodSpy.should.have.been.calledOnce;
+
+            instance.setMod('mod1', 'val2');
+            instance.method();
+
+            baseMethodSpy.should.not.have.been.called;
+            modsMethodSpy.should.have.been.calledTwice;
+
+            instance.delMod('mod1');
+            instance.method();
+
+            baseMethodSpy.should.have.been.calledOnce;
+            modsMethodSpy.should.have.been.calledTwice;
+        });
     });
 
     describe('create', function() {

diff --git a/common.blocks/i-bem/i-bem.vanilla.js b/common.blocks/i-bem/i-bem.vanilla.js
@@ -141,8 +141,13 @@ function buildCheckMod(modName, modVal) {
 }
 
 function checkMod(block, modName, modVal) {
+    var prevModVal = block._processingMods[modName];
+
     // check if a block has either current or previous modifier value equal to passed modVal
-    return block.hasMod(modName, modVal) || block._processingMods[modName] === modVal;
+    return modVal === '*'?
+        /* jshint eqnull: true */
+        block.hasMod(modName) || prevModVal != null :
+        block.hasMod(modName, modVal) || prevModVal === modVal;
 }
 
 function convertModHandlersToMethods(props) {