fix for #6

fix touchstart and touchdrag event handlers with jQuery
yads · Dec 10, 2014 · e4affbe · e4affbe
1 parent bd57c1b
commit e4affbe
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 9 deletions.
diff --git a/dist/ng-tiny-scrollbar.js b/dist/ng-tiny-scrollbar.js
@@ -160,9 +160,10 @@ angular.module('ngTinyScrollbar', [])
                 }
 
                 function touchstart(event) {
-                    if (1 === event.touches.length) {
+                    var evntObj = (event && event.originalEvent) || event || $window.event;
+                    if (1 === evntObj.touches.length) {
                         event.stopPropagation();
-                        start(event.touches[0]);
+                        start(evntObj.touches[0]);
                     }
                 }
 
@@ -241,8 +242,11 @@ angular.module('ngTinyScrollbar', [])
                 }
 
                 function touchdrag(event) {
-                    event.preventDefault();
-                    drag(event.touches[0]);
+                    var evntObj = (event && event.originalEvent) || event || $window.event;
+                    if (1 === evntObj.touches.length) {
+                        event.preventDefault();
+                        drag(evntObj.touches[0]);
+                    }
                 }
 
                 function drag(event) {

diff --git a/dist/ng-tiny-scrollbar.min.js b/dist/ng-tiny-scrollbar.min.js
diff --git a/src/ng-tiny-scrollbar.js b/src/ng-tiny-scrollbar.js
@@ -160,9 +160,10 @@ angular.module('ngTinyScrollbar', [])
                 }
 
                 function touchstart(event) {
-                    if (1 === event.touches.length) {
+                    var evntObj = (event && event.originalEvent) || event || $window.event;
+                    if (1 === evntObj.touches.length) {
                         event.stopPropagation();
-                        start(event.touches[0]);
+                        start(evntObj.touches[0]);
                     }
                 }
 
@@ -241,8 +242,11 @@ angular.module('ngTinyScrollbar', [])
                 }
 
                 function touchdrag(event) {
-                    event.preventDefault();
-                    drag(event.touches[0]);
+                    var evntObj = (event && event.originalEvent) || event || $window.event;
+                    if (1 === evntObj.touches.length) {
+                        event.preventDefault();
+                        drag(evntObj.touches[0]);
+                    }
                 }
 
                 function drag(event) {

diff --git a/test/test.jquery.html b/test/test.jquery.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head lang="en">
+    <meta charset="UTF-8">
+    <title></title>
+</head>
+<body>
+
+</body>
+</html>