Revert "Fixed touch scrolling issue in Surface and WP devices (#18737)"

The patch prevents Escalator and Grid from ever being rendered on IE8 because element.addEventListener does not exist there

This reverts commit eb2f5ac3a714aefce948d447a4004b94e35e44a9.

Change-Id: I58f6db7432a1cd10299891b2d8c55c855e87265f

diff --git a/client/src/main/java/com/vaadin/client/BrowserInfo.java b/client/src/main/java/com/vaadin/client/BrowserInfo.java
index bce96fe2c7fd74e002eb00e4f244c46516a40ed0..f037fba17513726f3cf4c64f0166e1e73403625c 100644 (file)
--- a/client/src/main/java/com/vaadin/client/BrowserInfo.java
+++ b/client/src/main/java/com/vaadin/client/BrowserInfo.java
@@ -245,10 +245,6 @@ public class BrowserInfo {
         return browserDetails.isEdge();
     }
 
-    public boolean isIEOrEdge() {
-        return browserDetails.isIE() || browserDetails.isEdge();
-    }
-
     public boolean isFirefox() {
         return browserDetails.isFirefox();
     }

diff --git a/client/src/main/java/com/vaadin/client/widgets/Escalator.java b/client/src/main/java/com/vaadin/client/widgets/Escalator.java
index 14c75a00ba03bc22a97bb1e037d4bdbfa1793b36..9eaa7ddd3671adf43c356a865bb3316b1f671fae 100644 (file)
--- a/client/src/main/java/com/vaadin/client/widgets/Escalator.java
+++ b/client/src/main/java/com/vaadin/client/widgets/Escalator.java
@@ -457,15 +457,6 @@ public class Escalator extends Widget
                 }
 
                 int pagePosition(CustomTouchEvent event) {
-                    // Use native event's screen x and y for IEs and Edge
-                    // since there is no touches for these browsers (#18737)
-                    if (BrowserInfo.get().isIEOrEdge()) {
-                        return vertical
-                                ? event.getNativeEvent().getClientY()
-                                        + Window.getScrollTop()
-                                : event.getNativeEvent().getClientX()
-                                        + Window.getScrollLeft();
-                    }
                     JsArray<Touch> a = event.getNativeEvent().getTouches();
                     return vertical ? a.get(0).getPageY() : a.get(0).getPageX();
                 }
@@ -505,7 +496,7 @@ public class Escalator extends Widget
             };
 
             public void touchStart(final CustomTouchEvent event) {
-                if (allowTouch(event)) {
+                if (event.getNativeEvent().getTouches().length() == 1) {
                     if (yMov == null) {
                         yMov = new Movement(true);
                         xMov = new Movement(false);
@@ -553,15 +544,6 @@ public class Escalator extends Widget
                 }
             }
 
-            // Allow touchStart for IE and Edge even though there is no touch
-            // (#18737),
-            // otherwise allow touch only if there is a single touch in the
-            // event
-            private boolean allowTouch(final CustomTouchEvent event) {
-                return BrowserInfo.get().isIEOrEdge()
-                        || event.getNativeEvent().getTouches().length() == 1;
-            }
-
             private double easingInOutCos(double val, double max) {
                 return 0.5 - 0.5 * Math.cos(Math.PI * Math.signum(val)
                         * Math.min(Math.abs(val), max) / max);
@@ -976,7 +958,7 @@ public class Escalator extends Widget
 
         public native void attachTouchListeners(Element element)
         /*
-         * Attaching events with JSNI instead of the GWT event mechanism because
+         * Detaching events with JSNI instead of the GWT event mechanism because
          * GWT didn't provide enough details in events, or triggering the event
          * handlers with GWT bindings was unsuccessful. Maybe, with more time
          * and skill, it could be done with better success. JavaScript overlay
@@ -1014,48 +996,6 @@ public class Escalator extends Widget
             }
         }-*/;
 
-        /**
-         * Using mousedown, mousemove, and mouseup for IE and Edge instead of
-         * touch* listeners (#18737)
-         * 
-         * @param element
-         */
-        public native void attachMouseDragListeners(Element element)
-        /*
-         * Attaching events with JSNI instead of the GWT event mechanism because
-         * GWT didn't provide enough details in events, or triggering the event
-         * handlers with GWT bindings was unsuccessful. Maybe, with more time
-         * and skill, it could be done with better success. JavaScript overlay
-         * types might work. This might also get rid of the JsniWorkaround
-         * class.
-         */
-        /*-{
-            element.addEventListener("mousedown", this.@com.vaadin.client.widgets.JsniWorkaround::touchStartFunction);
-            element.addEventListener("mousemove", this.@com.vaadin.client.widgets.JsniWorkaround::touchMoveFunction);
-            element.addEventListener("mouseup", this.@com.vaadin.client.widgets.JsniWorkaround::touchEndFunction);
-        }-*/;
-
-        /**
-         * Using mousedown, mousemove, and mouseup for IE and Edge instead of
-         * touch* listeners (#18737)
-         * 
-         * @param element
-         */
-        public native void detachMouseDragListeners(Element element)
-        /*
-         * Detaching events with JSNI instead of the GWT event mechanism because
-         * GWT didn't provide enough details in events, or triggering the event
-         * handlers with GWT bindings was unsuccessful. Maybe, with more time
-         * and skill, it could be done with better success. JavaScript overlay
-         * types might work. This might also get rid of the JsniWorkaround
-         * class.
-         */
-        /*-{
-            element.removeEventListener("mousedown", this.@com.vaadin.client.widgets.JsniWorkaround::touchStartFunction);
-            element.removeEventListener("mousemove", this.@com.vaadin.client.widgets.JsniWorkaround::touchMoveFunction);
-            element.removeEventListener("mouseup", this.@com.vaadin.client.widgets.JsniWorkaround::touchEndFunction);
-        }-*/;
-
         public void scrollToColumn(final int columnIndex,
                 final ScrollDestination destination, final int padding) {
             assert columnIndex >= columnConfiguration.frozenColumns : "Can't scroll to a frozen column";
@@ -5832,13 +5772,7 @@ public class Escalator extends Widget
         scroller.attachScrollListener(verticalScrollbar.getElement());
         scroller.attachScrollListener(horizontalScrollbar.getElement());
         scroller.attachMousewheelListener(getElement());
-
-        if (BrowserInfo.get().isIEOrEdge()) {
-            // Touch listeners doesn't work for IE and Edge (#18737)
-            scroller.attachMouseDragListeners(getElement());
-        } else {
-            scroller.attachTouchListeners(getElement());
-        }
+        scroller.attachTouchListeners(getElement());
     }
 
     @Override
@@ -5847,13 +5781,7 @@ public class Escalator extends Widget
         scroller.detachScrollListener(verticalScrollbar.getElement());
         scroller.detachScrollListener(horizontalScrollbar.getElement());
         scroller.detachMousewheelListener(getElement());
-
-        if (BrowserInfo.get().isIEOrEdge()) {
-            // Touch listeners doesn't work for IE and Edge (#18737)
-            scroller.detachMouseDragListeners(getElement());
-        } else {
-            scroller.detachTouchListeners(getElement());
-        }
+        scroller.detachTouchListeners(getElement());
 
         /*
          * We can call paintRemoveRows here, because static ranges are simple to

diff --git a/themes/src/main/themes/VAADIN/themes/base/escalator/escalator.scss b/themes/src/main/themes/VAADIN/themes/base/escalator/escalator.scss
index 15fda265caa22b985411f856c7199f0d5bf2ef6a..2d5ad729fcc8a2e8ca7978dedfed3b65777148f1 100644 (file)
--- a/themes/src/main/themes/VAADIN/themes/base/escalator/escalator.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/escalator/escalator.scss
@@ -75,9 +75,6 @@
   }
 
   .#{$primaryStyleName}-body {
-    -ms-touch-action: none;
-    touch-action: none;
-
     z-index: 0;
     top: 0;