fixed interact.js pointer event bug for chrome

DimitarChristoff · Mar 27, 2017 · e95fb0d · e95fb0d
1 parent 7268fe0
commit e95fb0d
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/dist/slick.es6.min.js b/dist/slick.es6.min.js
diff --git a/dist/slick.es6.min.js.map b/dist/slick.es6.min.js.map
diff --git a/examples/example3.js b/examples/example3.js
@@ -1,9 +1,7 @@
-import {Grid, Formatters, Editors} from '../src/';
+import {Grid, Formatters, Editors} from '../';
 import CellSelectionModel from '../plugins/slick.cellselectionmodel/slick.cellselectionmodel';
 import data from './example-data';
 
-console.log(Formatters)
-
 function requiredFieldValidator(value){
   if (value == null || value == undefined || !value.length){
     return {valid: false, msg: 'This is a required field'};

diff --git a/src/interact.js b/src/interact.js
@@ -246,7 +246,7 @@
     supportsTouch = (('ontouchstart' in window) || window.DocumentTouch && document instanceof window.DocumentTouch),
 
         // Does the browser support PointerEvents
-    supportsPointerEvent = !!PointerEvent,
+    supportsPointerEvent = PointerEvent && !/Chrome/.test(navigator.userAgent),
 
         // Less Precision with touch input
     margin = supportsTouch || supportsPointerEvent ? 20 : 10,
@@ -1375,16 +1375,18 @@
           this.matchElements = curMatchElements;
 
           this.pointerHover(pointer, event, this.matches, this.matchElements);
-          events.add(eventTarget,
-                                        PointerEvent ? pEventTypes.move : 'mousemove',
-                                        listeners.pointerHover);
+          events.add(eventTarget, supportsPointerEvent ?
+              pEventTypes.move :
+              'mousemove',
+            listeners.pointerHover);
         }
         else if (this.target){
           if (nodeContains(prevTargetElement, eventTarget)){
             this.pointerHover(pointer, event, this.matches, this.matchElements);
-            events.add(this.element,
-                                            PointerEvent ? pEventTypes.move : 'mousemove',
-                                            listeners.pointerHover);
+            events.add(this.element, supportsPointerEvent ?
+                pEventTypes.move :
+                'mousemove',
+              listeners.pointerHover);
           }
           else {
             this.target = null;
@@ -1434,7 +1436,7 @@
             // Remove temporary event listeners for selector Interactables
       if (!interactables.get(eventTarget)){
         events.remove(eventTarget,
-                                       PointerEvent ? pEventTypes.move : 'mousemove',
+                                       supportsPointerEvent ? pEventTypes.move : 'mousemove',
                                        listeners.pointerHover);
       }
 
@@ -3232,7 +3234,7 @@
     }
 
         // if it's a mouse interaction
-    if (mouseEvent || !(supportsTouch || supportsPointerEvent)){
+    if (mouseEvent || !supportsTouch || supportsPointerEvent){
             // find a mouse interaction that's not in inertia phase
       for (i = 0; i < len; i++){
         if (interactions[i].mouse && !interactions[i].inertiaStatus.active){
@@ -3906,7 +3908,7 @@
       _window = getWindow(element);
 
       if (isElement(element, _window)){
-        if (PointerEvent){
+        if (supportsPointerEvent){
           events.add(this._element, pEventTypes.down, listeners.pointerDown);
           events.add(this._element, pEventTypes.move, listeners.pointerHover);
         }
@@ -5747,7 +5749,7 @@
       events.add(doc, eventType, delegateUseCapture, true);
     }
 
-    if (PointerEvent){
+    if (supportsPointerEvent){
       if (PointerEvent === win.MSPointerEvent){
         pEventTypes = {
           up: 'MSPointerUp', down: 'MSPointerDown', over: 'mouseover',