Buttons can be clicked even if touchmoves are thrown

src/js/button.js

@@ -15,23 +15,9 @@ vjs.Button = vjs.Component.extend({
   init: function(player, options){
     vjs.Component.call(this, player, options);
 
-    var touchstart = false;
-    this.on('touchstart', function(event) {
-      // Stop click and other mouse events from triggering also
-      event.preventDefault();
-      touchstart = true;
-    });
-    this.on('touchmove', function() {
-      touchstart = false;
-    });
-    var self = this;
-    this.on('touchend', function(event) {
-      if (touchstart) {
-        self.onClick(event);
-      }
-      event.preventDefault();
-    });
+    this.emitTapEvents();
 
+    this.on('tap', this.onClick);
     this.on('click', this.onClick);
     this.on('focus', this.onFocus);
     this.on('blur', this.onBlur);

src/js/component.js

@@ -833,29 +833,52 @@ vjs.Component.prototype.onResize;
  * @private
  */
 vjs.Component.prototype.emitTapEvents = function(){
-  var touchStart, touchTime, couldBeTap, noTap;
+  var touchStart, firstTouch, touchTime, couldBeTap, noTap,
+      xdiff, ydiff, touchDistance;
 
   // Track the start time so we can determine how long the touch lasted
   touchStart = 0;
+  firstTouch = null;
 
   this.on('touchstart', function(event) {
-    // Record start time so we can detect a tap vs. "touch and hold"
-    touchStart = new Date().getTime();
-    // Reset couldBeTap tracking
-    couldBeTap = true;
+    // If more than one finger, don't consider treating this as a click
+    if (event.touches.length === 1) {
+      firstTouch = event.touches[0];
+      // Record start time so we can detect a tap vs. "touch and hold"
+      touchStart = new Date().getTime();
+      // Reset couldBeTap tracking
+      couldBeTap = true;
+    }
+  });
+
+  this.on('touchmove', function(event) {
+    // If more than one finger, don't consider treating this as a click
+    if (event.touches.length > 1) {
+      couldBeTap = false;
+    } else if (firstTouch) {
+      // Some devices will throw touchmoves for all but the slightest of taps.
+      // So, if we moved only a small distance, this could still be a tap
+      // 44 pixels is somewhat abitrary, based on Apple HIG 44px min button size
+      xdiff = event.touches[0].pageX - firstTouch.pageX;
+      ydiff = event.touches[0].pageY - firstTouch.pageY;
+      touchDistance = Math.sqrt(xdiff * xdiff + ydiff * ydiff);
+      if (touchDistance > 44) {
+        couldBeTap = false;
+      }
+    }
   });
 
   noTap = function(){
     couldBeTap = false;
   };
   // TODO: Listen to the original target. http://youtu.be/DujfpXOKUp8?t=13m8s
-  this.on('touchmove', noTap);
   this.on('touchleave', noTap);
   this.on('touchcancel', noTap);
 
   // When the touch ends, measure how long it took and trigger the appropriate
   // event
   this.on('touchend', function(event) {
+    firstTouch = null;
     // Proceed only if the touchmove/leave/cancel event didn't happen
     if (couldBeTap === true) {
       // Measure how long the touch lasted

test/unit/component.js

@@ -229,7 +229,7 @@ test('should use a defined content el for appending children', function(){
 });
 
 test('should emit a tap event', function(){
-  expect(1);
+  expect(2);
 
   // Fake touch support. Real touch support isn't needed for this test.
   var origTouch = vjs.TOUCH_ENABLED;
@@ -241,13 +241,27 @@ test('should emit a tap event', function(){
   comp.on('tap', function(){
     ok(true, 'Tap event emitted');
   });
-  comp.trigger('touchstart');
+
+  // A touchstart followed by touchend should trigger a tap
+  vjs.trigger(comp.el(), {type: 'touchstart', touches: [{}]});
+  comp.trigger('touchend');
+
+  // A touchmove with a lot of movement should not trigger a tap
+  vjs.trigger(comp.el(), {type: 'touchstart', touches: [
+    { pageX: 0, pageY: 0 }
+  ]});
+  vjs.trigger(comp.el(), {type: 'touchmove', touches: [
+    { pageX: 100, pageY: 100 }
+  ]});
   comp.trigger('touchend');
 
-  // This second test should not trigger another tap event because
-  // a touchmove is happening
-  comp.trigger('touchstart');
-  comp.trigger('touchmove');
+  // A touchmove with not much movement should still allow a tap
+  vjs.trigger(comp.el(), {type: 'touchstart', touches: [
+    { pageX: 0, pageY: 0 }
+  ]});
+  vjs.trigger(comp.el(), {type: 'touchmove', touches: [
+    { pageX: 10, pageY: 10 }
+  ]});
   comp.trigger('touchend');
 
   // Reset to orignial value