Fix touch events.

nx1988 · Jun 15, 2014 · 2df090e · 2df090e
1 parent bce2c80
commit 2df090e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/lib/morris.grid.coffee b/lib/morris.grid.coffee
@@ -59,8 +59,7 @@ class Morris.Grid extends Morris.EventEmitter
     @el.bind 'touchstart touchmove touchend', (evt) =>
       touch = evt.originalEvent.touches[0] or evt.originalEvent.changedTouches[0]
       offset = @el.offset()
-      @fire 'hover', touch.pageX - offset.left, touch.pageY - offset.top
-      touch
+      @fire 'hovermove', touch.pageX - offset.left, touch.pageY - offset.top
 
     @el.bind 'click', (evt) =>
       offset = @el.offset()
@@ -87,6 +86,9 @@ class Morris.Grid extends Morris.EventEmitter
           window.clearTimeout @timeoutId
         @timeoutId = window.setTimeout @resizeHandler, 100
 
+    # Disable tap highlight on iOS.
+    @el.css('-webkit-tap-highlight-color', 'rgba(0,0,0,0)')
+
     @postInit() if @postInit
 
   # Default options

diff --git a/morris.js b/morris.js
@@ -127,8 +127,7 @@ Licensed under the BSD-2-Clause License.
         var offset, touch;
         touch = evt.originalEvent.touches[0] || evt.originalEvent.changedTouches[0];
         offset = _this.el.offset();
-        _this.fire('hover', touch.pageX - offset.left, touch.pageY - offset.top);
-        return touch;
+        return _this.fire('hovermove', touch.pageX - offset.left, touch.pageY - offset.top);
       });
       this.el.bind('click', function(evt) {
         var offset;
@@ -160,6 +159,7 @@ Licensed under the BSD-2-Clause License.
           return _this.timeoutId = window.setTimeout(_this.resizeHandler, 100);
         });
       }
+      this.el.css('-webkit-tap-highlight-color', 'rgba(0,0,0,0)');
       if (this.postInit) {
         this.postInit();
       }