Merge pull request #1379 from creedencewright/smdenis.getmods.fix

i-bem: поправлен getMods()
bem · Jun 29, 2016 · 6609b0a · 6609b0a
2 parents 04c64ef + 81f3b0d
commit 6609b0a
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 22 deletions.
diff --git a/common.blocks/i-bem/__dom/i-bem__dom.js b/common.blocks/i-bem/__dom/i-bem__dom.js
@@ -605,6 +605,29 @@ DOM = BEM.decl('i-bem__dom',/** @lends BEMDOM.prototype */{
         });
     },
 
+    /**
+     * Returns values of modifiers of the block/nested element
+     * @param {Object} [elem] Nested element
+     * @param {String} [...modNames] Modifier names
+     * @returns {Object} Hash of modifier values
+     */
+    getMods : function(elem) {
+        var hasElem = elem && typeof elem !== 'string',
+            modCache = this._modCache,
+            modNames = [].slice.call(arguments, hasElem? 1 : 0),
+            res = this._extractMods(modNames, hasElem? elem : undef);
+
+        if(!hasElem) { // Caching
+            modNames.length?
+                modNames.forEach(function(name) {
+                    modCache[name] = res[name];
+                }) :
+                modCache = res;
+        }
+
+        return res;
+    },
+
     /**
      * Sets a modifier for a block/nested element
      * @param {jQuery} [elem] Nested element

diff --git a/common.blocks/i-bem/i-bem.spec.js b/common.blocks/i-bem/i-bem.spec.js
@@ -114,7 +114,18 @@ describe('i-bem', function() {
             delete BEM.blocks['block'];
         });
 
+        describe('getMods', function() {
+            it('should return specified mods', function() {
+                block.getMods('mod1', 'mod2', 'mod3').should.be.eql({ mod1 : 'val1', mod2 : true, mod3 : false });
+            });
+        });
+
         describe('getMod', function() {
+            it('should return correct value after getMods()', function() {
+                block.getMods();
+                block.getMod('mod1').should.be.equal('val1');
+            });
+
             it('should return current mod\'s value', function() {
                 block.getMod('mod1').should.be.equal('val1');
             });

diff --git a/common.blocks/i-bem/i-bem.vanilla.js b/common.blocks/i-bem/i-bem.vanilla.js
@@ -331,18 +331,18 @@ var BEM = inherit(events.Emitter, /** @lends BEM.prototype */ {
      */
     getMods : function(elem) {
         var hasElem = elem && typeof elem !== 'string',
-            modNames = [].slice.call(arguments, hasElem? 1 : 0),
-            res = this._extractMods(modNames, hasElem? elem : undef);
-
-        if(!hasElem) { // caching
-            modNames.length?
-                modNames.forEach(function(name) {
-                    this._modCache[name] = res[name];
-                }, this) :
-                this._modCache = res;
-        }
+            modCache = this._modCache,
+            modNames = [].slice.call(arguments, hasElem? 1 : 0);
+
+        return !modNames.length?
+            modCache :
+            modNames.reduce(function(res, mod) {
+                if(mod in modCache) {
+                    res[mod] = modCache[mod];
+                }
 
-        return res;
+                return res;
+            }, {});
     },
 
     /**
@@ -525,17 +525,6 @@ var BEM = inherit(events.Emitter, /** @lends BEM.prototype */ {
         return '';
     },
 
-    /**
-     * Retrieves name/value for a list of modifiers
-     * @private
-     * @param {Array} modNames Names of modifiers
-     * @param {Object} [elem] Element
-     * @returns {Object} Hash of modifier values by name
-     */
-    _extractMods : function(modNames, elem) {
-        return {};
-    },
-
     /**
      * Returns a block's default parameters
      * @protected