diff options
| author | Johannes Dahlström <johannes.dahlstrom@vaadin.com> | 2012-08-07 13:27:30 +0000 |
|---|---|---|
| committer | Johannes Dahlström <johannes.dahlstrom@vaadin.com> | 2012-08-07 13:27:30 +0000 |
| commit | b5d5e2029cc39bcdd3ff7cd870f5a84c853e4614 (patch) | |
| tree | c7bbe3d091ad88b1d6dc8971e11aeec39a96f70a | |
| parent | 22116474403982fbeb44112c385657cc9dee8d19 (diff) | |
| download | vaadin-framework-b5d5e2029cc39bcdd3ff7cd870f5a84c853e4614.tar.gz vaadin-framework-b5d5e2029cc39bcdd3ff7cd870f5a84c853e4614.zip | |
Remove #8792 fix from 6.8.2, defer to 6.8.3
svn changeset:24098/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, 4 insertions, 10 deletions
diff --git a/WebContent/VAADIN/themes/base/common/common.css b/WebContent/VAADIN/themes/base/common/common.css index 6bc3fea9b0..74ed21bd1a 100644 --- 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 76c9552e6a..4b9f3eacab 100644 --- 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; } |