Skip to content

Commit 92797c8

Browse files
authored
fix: Require Safari 14 minimum (#13418)
* Require Safari 14 minimum
1 parent c5cabbc commit 92797c8

2 files changed

Lines changed: 9 additions & 8 deletions

File tree

flow-server/src/main/java/com/vaadin/flow/shared/BrowserDetails.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -616,13 +616,12 @@ public boolean isTooOldToFunctionProperly() {
616616
if (isEdge() && getBrowserMajorVersion() < 79) {
617617
return true;
618618
}
619-
// Safari 13+
620-
if (isSafari() && getBrowserMajorVersion() < 13) {
621-
if (getOperatingSystemMajorVersion() > 14) {
622-
return false;
623-
}
624-
if (getOperatingSystemMajorVersion() == 14
625-
&& getOperatingSystemMinorVersion() >= 7) {
619+
// Safari 14+
620+
if (isSafari() && getBrowserMajorVersion() < 14) {
621+
if (isIPhone() && (getOperatingSystemMajorVersion() > 14
622+
|| (getOperatingSystemMajorVersion() == 14
623+
&& getOperatingSystemMinorVersion() >= 7))) {
624+
// #11654
626625
return false;
627626
}
628627
return true;

flow-server/src/test/java/com/vaadin/flow/shared/BrowserDetailsTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ public class BrowserDetailsTest extends TestCase {
6363
private static final String SAFARI10_WINDOWS = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/603.3.8 (KHTML, like Gecko) Version/10.1.2 Safari/603.3.8";
6464
private static final String SAFARI11_MAC = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_4) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.1 Safari/605.1.15";
6565
private static final String SAFARI13_MAC = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_2) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.4 Safari/605.1.15";
66+
private static final String SAFARI14_MAC = "Mozilla/5.0 (Macintosh; Intel Mac OS X 11_6_2) AppleWebKit/611.3.10.1.5 (KHTML, like Gecko) Version/14.1.2 Safari/611.3.10.1.5";
6667

6768
private static final String IPHONE_IOS_5_1 = "Mozilla/5.0 (iPhone; CPU iPhone OS 5_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9B179 Safari/7534.48.3";
6869
private static final String IPHONE_IOS_4_0 = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7";
@@ -596,7 +597,8 @@ public void testTooOldBrowsers() {
596597
assertTooOld(EDGE_18);
597598
assertTooOld(SAFARI11_MAC);
598599
assertNotTooOld(EDGE_79);
599-
assertNotTooOld(SAFARI13_MAC);
600+
assertTooOld(SAFARI13_MAC);
601+
assertNotTooOld(SAFARI14_MAC);
600602
}
601603

602604
public void testEclipseMac_safari91() {

0 commit comments

Comments
 (0)