summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fontein <ff@dybuster.com>2019-10-03 14:46:33 +0200
committerZhe Sun <31067185+ZheSun88@users.noreply.github.com>2019-10-04 10:20:39 +0300
commitc825eab83601ff3aa8075fe621389cdc8ae25586 (patch)
treed2a60293a330ed1184fde5b13a6f6638abd4014c
parent8d32d6887c80791c130414226e79279378fb0a23 (diff)
downloadvaadin-framework-c825eab83601ff3aa8075fe621389cdc8ae25586.tar.gz
vaadin-framework-c825eab83601ff3aa8075fe621389cdc8ae25586.zip
Make sure Firefox for iOS isn't detected as too old to function. (#11739)
Change-Id: Iea13b958356b0246586bcb7e9969bc26db43bb96
-rw-r--r--shared/src/main/java/com/vaadin/shared/VBrowserDetails.java8
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) {