wip

bem · Sep 9, 2014 · 9739588 · 9739588
1 parent 1c3b4d3
commit 9739588
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 7 deletions.
diff --git a/common.blocks/dropdown/_switcher/dropdown_switcher_link.spec.js b/common.blocks/dropdown/_switcher/dropdown_switcher_link.spec.js
@@ -22,7 +22,7 @@ describe('dropdown', function() {
         BEMDOM.destruct(dropdown.domElem);
     });
 
-    it('should open on button click', function() {
+    it('should open on link click', function() {
         dropdown.getSwitcher().emit('click');
         dropdown.hasMod('opened').should.be.true;
     });

diff --git a/common.blocks/dropdown/dropdown.bemhtml b/common.blocks/dropdown/dropdown.bemhtml
@@ -12,6 +12,8 @@ block('dropdown')(
         popupMods.theme || (popupMods.theme = this.mods.theme);
         popupMods.hasOwnProperty('autoclosable') || (popupMods.autoclosable = true);
 
+        popupMods.target = 'anchor';
+
         return [
             { elem : 'switcher', content : this.ctx.switcher },
             popup

diff --git a/common.blocks/dropdown/dropdown.bh.js b/common.blocks/dropdown/dropdown.bh.js
@@ -13,6 +13,8 @@ module.exports = function(bh) {
         popupMods.theme || (popupMods.theme = ctx.mod('theme'));
         popupMods.hasOwnProperty('autoclosable') || (popupMods.autoclosable = true);
 
+        popupMods.target = 'anchor';
+
         ctx.content([
            { elem : 'switcher', content : json.switcher },
            popup

diff --git a/common.blocks/dropdown/dropdown.deps.js b/common.blocks/dropdown/dropdown.deps.js
@@ -2,7 +2,13 @@
     mustDeps : { block : 'i-bem', elem : 'dom' },
     shouldDeps : [
         { elem : 'switcher' },
-        { block : 'popup', mods : { autoclosable : true } }
+        {
+            block : 'popup',
+            mods : {
+                autoclosable : true,
+                target : 'anchor'
+            }
+        }
     ]
 },
 {

diff --git a/common.blocks/dropdown/dropdown.js b/common.blocks/dropdown/dropdown.js
@@ -53,7 +53,7 @@ provide(BEMDOM.decl(this.name, /** @lends dropdown.prototype */{
     getPopup : function() {
         return this._popup ||
             (this._popup = this.findBlockInside('popup')
-                .setTarget(this.getSwitcher())
+                .setAnchor(this.getSwitcher())
                 .on({ modName : 'visible', modVal : '*' }, this._onPopupVisibilityChange, this));
     },
 

diff --git a/common.blocks/select/select.bemhtml b/common.blocks/select/select.bemhtml
@@ -39,7 +39,7 @@ block('select')(
             { elem : 'button' },
             {
                 block : 'popup',
-                mods : { theme : this.mods.theme, autoclosable : true },
+                mods : { target : 'anchor', theme : this.mods.theme, autoclosable : true },
                 directions : ['bottom-left', 'bottom-right', 'top-left', 'top-right'],
                 content : { block : this.block, mods : this.mods, elem : 'menu' }
             }

diff --git a/common.blocks/select/select.bh.js b/common.blocks/select/select.bh.js
@@ -32,7 +32,7 @@ module.exports = function(bh) {
             { elem : 'button' },
             {
                 block : 'popup',
-                mods : { theme : ctx.mod('theme'), autoclosable : true },
+                mods : { target : 'anchor', theme : ctx.mod('theme'), autoclosable : true },
                 directions : ['bottom-left', 'bottom-right', 'top-left', 'top-right'],
                 content : { block : json.block, mods : ctx.mods(), elem : 'menu' }
             }

diff --git a/common.blocks/select/select.deps.js b/common.blocks/select/select.deps.js
@@ -3,7 +3,13 @@
     shouldDeps : [
         { mods : { focused : true } },
         { elems : ['control', 'button', 'menu'] },
-        { block : 'popup', mods : { autoclosable : true } },
+        {
+            block : 'popup',
+            mods : {
+                autoclosable : true,
+                target : 'anchor'
+            }
+        },
         { block : 'keyboard', elem : 'codes' },
         { block : 'strings', elem : 'escape' }
     ]

diff --git a/common.blocks/select/select.js b/common.blocks/select/select.js
@@ -36,7 +36,7 @@ provide(BEMDOM.decl(this.name, /** @lends select.prototype */{
                     .on('click', this._onButtonClick, this);
 
                 this._popup = this.findBlockInside('popup')
-                    .setTarget(this._button)
+                    .setAnchor(this._button)
                     .on({ modName : 'visible', modVal : '' }, this._onPopupHide, this);
 
                 this._menu = this._popup.findBlockInside('menu')