Merge 9d2a56b into da29203

bem · Nov 15, 2016 · f3515da · f3515da
2 parents da29203 + 9d2a56b
commit f3515da
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 8 deletions.
diff --git a/common.blocks/button/_togglable/button_togglable_check.spec.js b/common.blocks/button/_togglable/button_togglable_check.spec.js
@@ -41,7 +41,8 @@ describe('button_togglable_check', function() {
                     .trigger(new $.Event('pointerrelease', {
                         target : onBlock? button.domElem[0] : $('body'),
                         originalEvent : new $.Event('pointerup')
-                    }));
+                    }))
+                    .trigger('pointerclick');
             }
 
             triggerPointerUpPointerDown(true);

diff --git a/common.blocks/button/_togglable/button_togglable_radio.spec.js b/common.blocks/button/_togglable/button_togglable_radio.spec.js
@@ -41,7 +41,8 @@ describe('button_togglable_radio', function() {
                     .trigger(new $.Event('pointerrelease', {
                         target : onBlock? button.domElem[0] : $('body'),
                         originalEvent : new $.Event('pointerup')
-                    }));
+                    }))
+                    .trigger('pointerclick');
             }
 
             triggerPointerUpPointerDown(true);

diff --git a/common.blocks/button/button.js b/common.blocks/button/button.js
@@ -116,16 +116,21 @@ provide(BEMDOM.decl({ block : this.name, baseBlock : Control }, /** @lends butto
             this._focusedByPointer = true;
             this._focus();
             this._focusedByPointer = false;
-            this
-                ._updateChecked()
-                .emit('click');
+            this.bindTo('pointerclick', this._onPointerClick);
         } else {
             this._blur();
         }
 
         this.delMod('pressed');
     },
 
+    _onPointerClick : function() {
+        this
+            .unbindFrom('pointerclick', this._onPointerClick)
+            ._updateChecked()
+            .emit('click');
+    },
+
     _onKeyDown : function(e) {
         if(this.hasMod('disabled')) return;
 

diff --git a/common.blocks/button/button.spec.js b/common.blocks/button/button.spec.js
@@ -104,7 +104,8 @@ describe('button', function() {
                 .on('click', spy)
                 .domElem
                     .trigger('pointerpress')
-                    .trigger(createPointerrelease());
+                    .trigger(createPointerrelease())
+                    .trigger('pointerclick');
 
             spy.should.have.been.calledOnce;
         });

diff --git a/common.blocks/select/select.spec.js b/common.blocks/select/select.spec.js
@@ -79,12 +79,14 @@ describe('select', function() {
         it('should toggle popup after click on button', function() {
             button.domElem
                 .trigger('pointerpress')
-                .trigger(createPointerrelease());
+                .trigger(createPointerrelease())
+                .trigger('pointerclick');
             select.hasMod('opened').should.be.true;
 
             button.domElem
                 .trigger('pointerpress')
-                .trigger(createPointerrelease());
+                .trigger(createPointerrelease())
+                .trigger('pointerclick');
             select.hasMod('opened').should.be.false;
         });