diff options
| -rw-r--r-- | WebContent/VAADIN/themes/base/common/common.css | 6 | ||||
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/BrowserInfo.java | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/WebContent/VAADIN/themes/base/common/common.css b/WebContent/VAADIN/themes/base/common/common.css index 74ed21bd1a..4dbe35704c 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; -}
\ No newline at end of file +} +/* Enable kinetic scrolling on Mobile Safari 6 */ +.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 6a94611a60..838af93ed5 100644 --- a/src/com/vaadin/terminal/gwt/client/BrowserInfo.java +++ b/src/com/vaadin/terminal/gwt/client/BrowserInfo.java @@ -447,13 +447,15 @@ public class BrowserInfo { if (!isTouchDevice()) { return false; } + // TODO Should test other Android browsers, especially Chrome 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 6 Safari supports native scrolling; iOS 5 suffers from #8792 + // TODO Should test other iOS browsers + if (isIOS() && isSafari() && getBrowserMajorVersion() >= 6) { + return false; + } return true; } |