diff options
| author | Juho Nurminen <juho@vaadin.com> | 2014-08-14 17:54:24 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-08-15 09:04:42 +0000 |
| commit | b0b9cc3389e2ae9e570fb698605bf923f042f222 (patch) | |
| tree | 039af9c6744decf3a8a092ac97fecbc8715f09b6 /shared | |
| parent | a2bf94616f7f58ec4256aaf1f9dbad735a20f529 (diff) | |
| download | vaadin-framework-b0b9cc3389e2ae9e570fb698605bf923f042f222.tar.gz vaadin-framework-b0b9cc3389e2ae9e570fb698605bf923f042f222.zip | |
Update VBrowserDetails to handle the new IE11 UA on WP 8.1 Update (#14376)
Change-Id: I7fdd091a3b2994270e9928eb4f118ab5ca59ef30
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/src/com/vaadin/shared/VBrowserDetails.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shared/src/com/vaadin/shared/VBrowserDetails.java b/shared/src/com/vaadin/shared/VBrowserDetails.java index 3680e4168e..81a39cdedc 100644 --- a/shared/src/com/vaadin/shared/VBrowserDetails.java +++ b/shared/src/com/vaadin/shared/VBrowserDetails.java @@ -68,19 +68,19 @@ public class VBrowserDetails implements Serializable { isGecko = userAgent.indexOf("gecko") != -1 && userAgent.indexOf("webkit") == -1 && userAgent.indexOf("trident/") == -1; - isWebKit = userAgent.indexOf("applewebkit") != -1; isPresto = userAgent.indexOf(" presto/") != -1; isTrident = userAgent.indexOf("trident/") != -1; + isWebKit = !isTrident && userAgent.indexOf("applewebkit") != -1; // browser name isChrome = userAgent.indexOf(" chrome/") != -1; - isSafari = !isChrome && userAgent.indexOf("safari") != -1; isOpera = userAgent.indexOf("opera") != -1; isIE = userAgent.indexOf("msie") != -1 && !isOpera && (userAgent.indexOf("webtv") == -1); // IE 11 no longer contains MSIE in the user agent isIE = isIE || isTrident; + isSafari = !isChrome && !isIE && userAgent.indexOf("safari") != -1; isFirefox = userAgent.indexOf(" firefox/") != -1; // chromeframe |