From c1fc86c9a6464f2e0a652a8bf18a20385aa27c10 Mon Sep 17 00:00:00 2001
From: Henrik Paul <henrik@vaadin.com>
Date: Fri, 17 Jan 2014 09:33:20 +0200
Subject: Only prevent default scroll event in Escalator if scrollbars are
 visible (#13238)

Change-Id: I03e10d2f7faf7cce70042879125d1d2ba2b4db66
---
 client/src/com/vaadin/client/ui/grid/Escalator.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'client/src')

diff --git a/client/src/com/vaadin/client/ui/grid/Escalator.java b/client/src/com/vaadin/client/ui/grid/Escalator.java
index 3ef8dcda31..80cb56675a 100644
--- a/client/src/com/vaadin/client/ui/grid/Escalator.java
+++ b/client/src/com/vaadin/client/ui/grid/Escalator.java
@@ -442,7 +442,13 @@ public class Escalator extends Widget {
              * TODO: only prevent if not scrolled to end/bottom. Or no? UX team
              * needs to decide.
              */
-            event.preventDefault();
+            final boolean warrantedYScroll = deltaY != 0
+                    && escalator.verticalScrollbar.needsScrollbars();
+            final boolean warrantedXScroll = deltaX != 0
+                    && escalator.horizontalScrollbar.needsScrollbars();
+            if (warrantedYScroll || warrantedXScroll) {
+                event.preventDefault();
+            }
         }
     }
 
-- 
cgit v1.2.3