diff options
| author | Johannes Dahlström <johannes.dahlstrom@vaadin.com> | 2012-08-07 11:46:34 +0000 |
|---|---|---|
| committer | Johannes Dahlström <johannes.dahlstrom@vaadin.com> | 2012-08-07 11:46:34 +0000 |
| commit | 0cb6d53b234eafbf94a3d451d7ebddd8d2e14e53 (patch) | |
| tree | 7626d591fbe8c44f1948eae9cce3e4cb80199b6a | |
| parent | acde6c0f95a86c2819f34616d8102ade90044c3a (diff) | |
| download | vaadin-framework-0cb6d53b234eafbf94a3d451d7ebddd8d2e14e53.tar.gz vaadin-framework-0cb6d53b234eafbf94a3d451d7ebddd8d2e14e53.zip | |
Enable native touch scrolling on iOS 6 (#8792)
svn changeset:24094/svn branch:6.8
| -rw-r--r-- | WebContent/VAADIN/themes/base/common/common.css | 4 | ||||
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/BrowserInfo.java | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/WebContent/VAADIN/themes/base/common/common.css b/WebContent/VAADIN/themes/base/common/common.css index 74ed21bd1a..6bc3fea9b0 100644 --- a/WebContent/VAADIN/themes/base/common/common.css +++ b/WebContent/VAADIN/themes/base/common/common.css @@ -233,4 +233,8 @@ 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 4b9f3eacab..76c9552e6a 100644 --- a/src/com/vaadin/terminal/gwt/client/BrowserInfo.java +++ b/src/com/vaadin/terminal/gwt/client/BrowserInfo.java @@ -450,13 +450,15 @@ public class BrowserInfo { if (!isTouchDevice()) { return false; } + // Android 4+ has native scrolling if (isAndroid() && isWebkit() && getWebkitVersion() >= 534) { return false; } - // Cannot enable native touch scrolling on iOS 5 until #8792 is resolved - // if (isIOS() && 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; + } return true; } |