simplify code

bem · Jul 23, 2015 · e217170 · e217170
1 parent 565e3f3
commit e217170
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 26 deletions.
diff --git a/common.blocks/dropdown/dropdown.bemhtml b/common.blocks/dropdown/dropdown.bemhtml
@@ -20,17 +20,9 @@ block('dropdown')(
         applyCtx(switcher);
     }),
     elem('switcher').mix()(function() {
-        var dropdown = this._dropdown,
-            dropdownMix = dropdown.mix,
-            switcherMix = dropdown.switcher.mix || [];
-
-        Array.isArray(switcherMix) || (switcherMix = [switcherMix]);
+        var dropdown = this._dropdown;
 
-        return switcherMix.concat(dropdownMix?
-                    Array.isArray(dropdownMix)?
-                        dropdownMix.concat([dropdown]) :
-                        [dropdownMix, dropdown] :
-                    dropdown);
+        return [dropdown].concat(dropdown.switcher.mix || [], dropdown.mix || []);
     }),
     elem('popup').def()(function() {
         var dropdown = this._dropdown,
@@ -46,9 +38,7 @@ block('dropdown')(
 
         popupMods.target = 'anchor';
 
-        var popupMix = popup.mix || [];
-        Array.isArray(popupMix) || (popupMix = [popupMix]);
-        popup.mix = popupMix.concat([dropdown]);
+        popup.mix = [dropdown].concat(popup.mix || []);
 
         applyCtx(popup);
     })

diff --git a/common.blocks/dropdown/dropdown.bh.js b/common.blocks/dropdown/dropdown.bh.js
@@ -2,21 +2,15 @@ module.exports = function(bh) {
 
     bh.match({
         'dropdown' : function(ctx) {
-            var dropdown = ctx.json(),
-                dropdownMix = dropdown.mix,
-                switcherMix = dropdown.switcher.mix || [];
-
-            Array.isArray(switcherMix) || (switcherMix = [switcherMix]);
+            var dropdown = ctx.json();
 
             ctx
                 .js(ctx.extend({ id : ctx.generateId() }, ctx.js()))
                 .tParam('dropdown', dropdown)
                 .tParam('theme', ctx.mod('theme'))
-                .tParam('mix', switcherMix.concat(dropdownMix?
-                    Array.isArray(dropdownMix)?
-                        dropdownMix.concat([dropdown]) :
-                        [dropdownMix, dropdown] :
-                    dropdown));
+                .tParam('mix', [dropdown].concat(
+                    dropdown.switcher.mix || [],
+                    dropdown.mix || []));
 
             return [{ elem : 'switcher' }, { elem : 'popup' }];
         },
@@ -35,9 +29,7 @@ module.exports = function(bh) {
 
             popupMods.target = 'anchor';
 
-            var popupMix = popup.mix || [];
-            Array.isArray(popupMix) || (popupMix = [popupMix]);
-            popup.mix = popupMix.concat([dropdown]);
+            popup.mix = [dropdown].concat(popup.mix || []);
 
             return popup;
         },