Merge pull request #13 from offirgolan/swipe-fixes

[BUGFIX] Use originalEvent to access touches

Author: offirgolan

addon/mixins/swipe-support.js

@@ -16,7 +16,7 @@ export default Ember.Mixin.create({
     this._super(...arguments);
 
     // jscs:disable
-    let touch = e.touches[0];
+    let touch = e.originalEvent.touches[0];
     // jscs:enable
 
     meta = {
@@ -33,7 +33,7 @@ export default Ember.Mixin.create({
     this._super(...arguments);
 
     // jscs:disable
-    let touch = e.touches[0];
+    let touch = e.originalEvent.touches[0];
     // jscs:enable
 
     meta.differences = {
@@ -47,7 +47,7 @@ export default Ember.Mixin.create({
     }
 
     // A valid swipe event uses only one finger
-    if (e.touches.length > 1) {
+    if (e.originalEvent.touches.length > 1) {
       meta.isInvalid = true;
     }
 

tests/helpers/trigger-swipe-event.js

@@ -4,17 +4,27 @@ export default function triggerSwipeEvent($el, direction, distance = 150) {
   let endPos = swipeRight ? distance : 0;
 
   $el.trigger($.Event('touchstart', {
-    touches: [{
-      pageX: startPos, pageY: 0,
-      screenX: startPos, screenY: 0
-    }]
+    isSimulated: true,
+    originalEvent: {
+      touches: [{
+        pageX: startPos,
+        pageY: 0,
+        screenX: startPos,
+        screenY: 0
+      }]
+    }
   }));
 
   $el.trigger($.Event('touchmove', {
-    touches: [{
-      pageX: endPos, pageY: 0,
-      screenX: endPos, screenY: 0
-    }]
+    isSimulated: true,
+    originalEvent: {
+      touches: [{
+        pageX: endPos,
+        pageY: 0,
+        screenX: endPos,
+        screenY: 0
+      }]
+    }
   }));
 
   $el.trigger($.Event('touchend'));