Make buttons follow DOM3 spec

Related #62 tap doesn't work in Firefox and IE11
googlearchive · Sep 26, 2014 · 82a3b23 · 82a3b23
1 parent 39d8ed9
commit 82a3b23
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/src/mouse.js b/src/mouse.js
@@ -15,6 +15,7 @@
 
   var WHICH_TO_BUTTONS = [0, 1, 4, 2];
 
+  var CURRENT_BUTTONS = 0;
   var HAS_BUTTONS = false;
   try {
     HAS_BUTTONS = new MouseEvent('test', {buttons: 1}).buttons === 1;
@@ -62,8 +63,12 @@
       e.isPrimary = true;
       e.pointerType = this.POINTER_TYPE;
       e._source = 'mouse';
-      if (!HAS_BUTTONS || (inEvent.type === 'mouseup' && inEvent.buttons === 0)) {
-        e.buttons = WHICH_TO_BUTTONS[e.which] || 0;
+      if (!HAS_BUTTONS) {
+        var type = inEvent.type;
+        if (type !== 'mousemove') {
+          CURRENT_BUTTONS ^= (WHICH_TO_BUTTONS[e.which] || 0);
+        }
+        e.buttons = CURRENT_BUTTONS;
       }
       return e;
     },

diff --git a/src/tap.js b/src/tap.js
@@ -61,7 +61,7 @@
     shouldTap: function(e, downState) {
       if (e.pointerType === 'mouse') {
         // only allow left click to tap for mouse
-        return e.buttons === 1 && downState.buttons === 1;
+        return (e.buttons ^ 1) && (downState.buttons & 1);
       }
       return !e.tapPrevented;
     },

diff --git a/test/js/fake.js b/test/js/fake.js
@@ -56,7 +56,7 @@
         cancelable: true,
         clientX: x,
         clientY: y,
-        buttons: 1,
+        buttons: type === 'up' ? 0 : 1,
         pointerId: 1,
         isPrimary: true,
         pointerType: 'mouse'

diff --git a/test/js/gestures.js b/test/js/gestures.js
@@ -44,7 +44,7 @@ suite('Platform Events', function() {
         function test(ev) {
           PolymerGestures.removeEventListener(document, 'up', test);
           assert.isTrue(ev.isPrimary);
-          assert.propertyVal(ev, 'buttons', 1);
+          assert.propertyVal(ev, 'buttons', 0);
           assert.propertyVal(ev, 'pointerId', 1);
           assert.property(ev, '_source');
           assert.property(ev, 'x');