diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2012-06-11 14:06:15 +0300 |
|---|---|---|
| committer | Johannes Dahlström <johannesd@vaadin.com> | 2012-06-11 14:06:15 +0300 |
| commit | 91d49d6bf7dbd465fe6a1efd70402bd130518e7f (patch) | |
| tree | b4d4ea4683db09f6ef7d7d3136ac79593bcb149a | |
| parent | 75e13a8d46289675925ff40dc71400298791d4c4 (diff) | |
| parent | 9ae6ce60f0965a17886b532d52de6ecdc42a173e (diff) | |
| download | vaadin-framework-91d49d6bf7dbd465fe6a1efd70402bd130518e7f.tar.gz vaadin-framework-91d49d6bf7dbd465fe6a1efd70402bd130518e7f.zip | |
Merge commit '9ae6c'
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/BrowserInfo.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/BrowserInfo.java b/src/com/vaadin/terminal/gwt/client/BrowserInfo.java index e28c499851..d27357c3c4 100644 --- a/src/com/vaadin/terminal/gwt/client/BrowserInfo.java +++ b/src/com/vaadin/terminal/gwt/client/BrowserInfo.java @@ -347,9 +347,10 @@ public class BrowserInfo { if (isAndroid() && isWebkit() && getWebkitVersion() >= 534) { return false; } - if (isIOS() && isWebkit() && getWebkitVersion() >= 534) { - return false; - } + // Cannot enable native touch scrolling on iOS 5 until #8792 is resolved + // if (isIOS() && isWebkit() && getWebkitVersion() >= 534) { + // return false; + // } return true; } |