Remove #8792 fix from 6.8.2, defer to 6.8.3

svn changeset:24098/svn branch:6.8

diff --git a/WebContent/VAADIN/themes/base/common/common.css b/WebContent/VAADIN/themes/base/common/common.css
index 6bc3fea9b0bf005e06ace12cdbe3151b9ccfe660..74ed21bd1a97ddde6a294aacc95151ee427be494 100644 (file)
--- a/WebContent/VAADIN/themes/base/common/common.css
+++ b/WebContent/VAADIN/themes/base/common/common.css
@@ -233,8 +233,4 @@ div.v-app-loading {
 
 .v-scrollable {
        overflow: auto;
-}
-/* Enable kinetic scrolling on Mobile Safari */
-.v-ios.v-sa6 .v-scrollable {
-       -webkit-overflow-scrolling: touch;
 }
\ No newline at end of file

diff --git a/src/com/vaadin/terminal/gwt/client/BrowserInfo.java b/src/com/vaadin/terminal/gwt/client/BrowserInfo.java
index 76c9552e6a7ba920fdb1035937e811fe21985e28..4b9f3eacab5228d935f784092bc24baa46aac6e2 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/BrowserInfo.java
+++ b/src/com/vaadin/terminal/gwt/client/BrowserInfo.java
@@ -450,15 +450,13 @@ public class BrowserInfo {
         if (!isTouchDevice()) {
             return false;
         }
-        // Android 4+ has native scrolling
         if (isAndroid() && isWebkit() && getWebkitVersion() >= 534) {
             return false;
         }
-        // iOS 5 has native scrolling but suffers from #8792;
-        // iOS 6 works fine.
-        if (isIOS() && isWebkit() && getWebkitVersion() >= 536) {
-            return false;
-        }
+        // Cannot enable native touch scrolling on iOS 5 until #8792 is resolved
+        // if (isIOS() && isWebkit() && getWebkitVersion() >= 534) {
+        // return false;
+        // }
         return true;
     }