Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Require Safari 14 minimum #13418

Merged
merged 2 commits into from
Apr 13, 2022
Merged

fix: Require Safari 14 minimum #13418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32f3954
Require Safari 14 minimum
TatuLund Apr 5, 2022
020072a
Update unit test
TatuLund Apr 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions flow-server/src/main/java/com/vaadin/flow/shared/BrowserDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,13 +616,12 @@ public boolean isTooOldToFunctionProperly() {
if (isEdge() && getBrowserMajorVersion() < 79) {
return true;
}
// Safari 13+
if (isSafari() && getBrowserMajorVersion() < 13) {
if (getOperatingSystemMajorVersion() > 14) {
return false;
}
if (getOperatingSystemMajorVersion() == 14
&& getOperatingSystemMinorVersion() >= 7) {
// Safari 14+
if (isSafari() && getBrowserMajorVersion() < 14) {
if (isIPhone() && (getOperatingSystemMajorVersion() > 14
|| (getOperatingSystemMajorVersion() == 14
&& getOperatingSystemMinorVersion() >= 7))) {
// #11654
return false;
}
return true;
Expand Down
4 changes: 3 additions & 1 deletion flow-server/src/test/java/com/vaadin/flow/shared/BrowserDetailsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ public class BrowserDetailsTest extends TestCase {
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";
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";
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";
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";

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";
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";
Expand Down Expand Up @@ -596,7 +597,8 @@ public void testTooOldBrowsers() {
assertTooOld(EDGE_18);
assertTooOld(SAFARI11_MAC);
assertNotTooOld(EDGE_79);
assertNotTooOld(SAFARI13_MAC);
assertTooOld(SAFARI13_MAC);
assertNotTooOld(SAFARI14_MAC);
}

public void testEclipseMac_safari91() {
Expand Down