diff options
author | Felix Fontein <ff@dybuster.com> | 2019-10-03 14:46:33 +0200 |
---|---|---|
committer | Zhe Sun <31067185+ZheSun88@users.noreply.github.com> | 2019-10-03 15:46:33 +0300 |
commit | 58a9520398348393378a0b98ae12a2c74c3463bb (patch) | |
tree | cb1a8fe7a79fd6c0d64484d677a95d2a47030530 /shared | |
parent | 1b4409936d6437f7493303e6a0ebd25cd31985e0 (diff) | |
download | vaadin-framework-58a9520398348393378a0b98ae12a2c74c3463bb.tar.gz vaadin-framework-58a9520398348393378a0b98ae12a2c74c3463bb.zip |
Make sure Firefox for iOS isn't detected as too old to function. (#11739)
Change-Id: Iea13b958356b0246586bcb7e9969bc26db43bb96
Diffstat (limited to 'shared')
-rw-r--r-- | shared/src/main/java/com/vaadin/shared/VBrowserDetails.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/shared/src/main/java/com/vaadin/shared/VBrowserDetails.java b/shared/src/main/java/com/vaadin/shared/VBrowserDetails.java index 38c64fef34..e8b36305d4 100644 --- a/shared/src/main/java/com/vaadin/shared/VBrowserDetails.java +++ b/shared/src/main/java/com/vaadin/shared/VBrowserDetails.java @@ -681,10 +681,14 @@ public class VBrowserDetails implements Serializable { return true; } // Webkit 533 in Safari 4.1+, Android 2.2+, iOS 4+ - if (isSafari() && getBrowserEngineVersion() < 533) { + // All iOS browsers use Safari as their engine. + if ((isSafari() || isIOS()) && getBrowserEngineVersion() < 533) { return true; } - if (isFirefox() && getBrowserMajorVersion() < 45) { + // Firefox for iOS uses a different versioning scheme and will + // fail the test. Since it is already covered by the iOS test + // above, ignore it here. + if (isFirefox() && !isIOS() && getBrowserMajorVersion() < 45) { return true; } if (isOpera() && getBrowserMajorVersion() < 11) { |