fixes #147 - isTouch and isPointerEventCompatible are both returning …

…true in WindowsPhone devices. fixed the if clause
briangonzalez · Dec 16, 2014 · 95eae6f · 95eae6f
1 parent 7107123
commit 95eae6f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "pep",
   "title": "jquery.pep.js",
   "description": "Kinetic drag for mobile & desktop",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "homepage": "http://pep.briangonzalez.org",
   "author": {
     "name": "Brian Gonzalez",

diff --git a/src/jquery.pep.js b/src/jquery.pep.js
@@ -511,7 +511,14 @@
   Pep.prototype.normalizeEvent = function(ev) {
       ev.pep        = {};
 
-      if ( this.isPointerEventCompatible() || !this.isTouch(ev) ) {
+      if ( this.isTouch(ev) ) {
+
+        ev.pep.x      = ev.originalEvent.touches[0].pageX;
+        ev.pep.y      = ev.originalEvent.touches[0].pageY;
+        ev.pep.type   = ev.type;
+
+      }
+      else if ( this.isPointerEventCompatible() || !this.isTouch(ev) ) {
 
         if ( ev.pageX  ) {
           ev.pep.x      = ev.pageX;
@@ -524,13 +531,8 @@
         ev.pep.type   = ev.type;
 
       }
-      else {
-        ev.pep.x      = ev.originalEvent.touches[0].pageX;
-        ev.pep.y      = ev.originalEvent.touches[0].pageY;
-        ev.pep.type   = ev.type;
-      }
-
-       return ev;
+
+      return ev;
    };
 
   // resetVelocityQueue()