From a0921417dcab99c1af00eb96f147b7b7a0e76e92 Mon Sep 17 00:00:00 2001
From: Ryan Johnston <ryan@mediapixel.co.nz>
Date: Wed, 26 Nov 2014 14:07:04 +1300
Subject: [PATCH 1/3] Support Windows Phone 8 and Browser with MOVE_TOLERANCE.

---
 src/ngTouch/directive/ngClick.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/ngTouch/directive/ngClick.js b/src/ngTouch/directive/ngClick.js
index 6cd0ff763032..71f7a6d4ea5f 100644
--- a/src/ngTouch/directive/ngClick.js
+++ b/src/ngTouch/directive/ngClick.js
@@ -185,7 +185,9 @@ ngTouch.directive('ngClick', ['$parse', '$timeout', '$rootElement',
         tapElement,  // Used to blur the element after a tap.
         startTime,   // Used to check if the tap was held too long.
         touchStartX,
-        touchStartY;
+        touchStartY,
+        clickStartX,
+        clickStartY;
 
     function resetState() {
       tapping = false;
@@ -258,6 +260,15 @@ ngTouch.directive('ngClick', ['$parse', '$timeout', '$rootElement',
     // - But the browser's follow-up slow click will be "busted" before it reaches this handler.
     // Therefore it's safe to use this directive on both mobile and desktop.
     element.on('click', function(event, touchend) {
+      if (!touchend) {
+        // If we have no touchend event, we should still check MOVE_TOLERANCE
+        // for standard browser clicks. Otherwise if we create directives that
+        // use the `swipe` service, the element will still receive clicks.
+        var x = event.clientX;
+        var y = event.clientY;
+        var dist = Math.sqrt( Math.pow(x - clickStartX, 2) + Math.pow(y - clickStartY, 2) );
+        if (dist >= MOVE_TOLERANCE) return;
+      }
       scope.$apply(function() {
         clickHandler(scope, {$event: (touchend || event)});
       });
@@ -265,6 +276,8 @@ ngTouch.directive('ngClick', ['$parse', '$timeout', '$rootElement',
 
     element.on('mousedown', function(event) {
       element.addClass(ACTIVE_CLASS_NAME);
+      clickStartX = event.clientX;
+      clickStartY = event.clientY;
     });
 
     element.on('mousemove mouseup', function(event) {

From bafa7063f00678e2a9c3f47de433e54d5ae0a306 Mon Sep 17 00:00:00 2001
From: Ryan Johnston <ryan@mediapixel.co.nz>
Date: Wed, 26 Nov 2014 15:54:29 +1300
Subject: [PATCH 2/3] Fixed code style error.

---
 src/ngTouch/directive/ngClick.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ngTouch/directive/ngClick.js b/src/ngTouch/directive/ngClick.js
index 71f7a6d4ea5f..347871dcedbc 100644
--- a/src/ngTouch/directive/ngClick.js
+++ b/src/ngTouch/directive/ngClick.js
@@ -266,7 +266,7 @@ ngTouch.directive('ngClick', ['$parse', '$timeout', '$rootElement',
         // use the `swipe` service, the element will still receive clicks.
         var x = event.clientX;
         var y = event.clientY;
-        var dist = Math.sqrt( Math.pow(x - clickStartX, 2) + Math.pow(y - clickStartY, 2) );
+        var dist = Math.sqrt(Math.pow(x - clickStartX, 2) + Math.pow(y - clickStartY, 2));
         if (dist >= MOVE_TOLERANCE) return;
       }
       scope.$apply(function() {

From 52de43f628ac803c48ac92ac6c212f88f01fdf69 Mon Sep 17 00:00:00 2001
From: Ryan Johnston <ryan@mediapixel.co.nz>
Date: Thu, 27 Nov 2014 10:30:12 +1300
Subject: [PATCH 3/3] Added test case, should not click if click is too far
 away.

---
 test/ngTouch/directive/ngClickSpec.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/test/ngTouch/directive/ngClickSpec.js b/test/ngTouch/directive/ngClickSpec.js
index 43735709abea..e5fd46f8dc36 100644
--- a/test/ngTouch/directive/ngClickSpec.js
+++ b/test/ngTouch/directive/ngClickSpec.js
@@ -408,6 +408,26 @@ describe('ngClick (touch)', function() {
 
 
   describe('click fallback', function() {
+    it('should not click if the click is too far away', inject(function($rootScope, $compile, $rootElement) {
+      element = $compile('<div ng-click="tapped = true"></div>')($rootScope);
+      $rootElement.append(element);
+      $rootScope.$digest();
+
+      expect($rootScope.tapped).toBeUndefined();
+
+      browserTrigger(element, 'mousedown',{
+        keys: [],
+        x: 10,
+        y: 10
+      });
+      browserTrigger(element, 'click',{
+        keys: [],
+        x: 400,
+        y: 400
+      });
+
+      expect($rootScope.tapped).toBeUndefined();
+    }));
 
     it('should treat a click as a tap on desktop', inject(function($rootScope, $compile) {
       element = $compile('<div ng-click="tapped = true"></div>')($rootScope);