diff options
| -rw-r--r-- | shared/src/main/java/com/vaadin/shared/VBrowserDetails.java | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/shared/src/main/java/com/vaadin/shared/VBrowserDetails.java b/shared/src/main/java/com/vaadin/shared/VBrowserDetails.java index 6933d32326..fdf9b5f723 100644 --- a/shared/src/main/java/com/vaadin/shared/VBrowserDetails.java +++ b/shared/src/main/java/com/vaadin/shared/VBrowserDetails.java @@ -611,21 +611,29 @@ public class VBrowserDetails implements Serializable { * @since 8.1 */ public boolean isEs6Supported() { - if (isTooOldToFunctionProperly()) { - return false; + // Safari 10+ + if (isSafari() && getBrowserMajorVersion() >= 10) { + return true; } - - // assumes evergreen browsers support ES6 - if (isChrome() || isFirefox() || isOpera() || isEdge()) { + // Firefox 51+ + if (isFirefox() && getBrowserMajorVersion() >= 51) { return true; } - - // Safari > 9 - if (isSafari() && getBrowserMajorVersion() > 9) { + // Opera 36+ + if (isOpera() && getBrowserMajorVersion() >= 36) { + return true; + } + // Chrome 49+ + if (isChrome() && getBrowserMajorVersion() >= 49) { + return true; + } + // Edge 15.15063+ + if (isEdge() && (getBrowserMajorVersion() > 15 + || (getBrowserMajorVersion() == 15 + && getBrowserMinorVersion() >= 15063))) { return true; } - // IE11 and Safari 9 return false; } |