Detect MS IE Edge (#813)

jenkinsci · Feb 13, 2017 · 397ad22 · 397ad22
1 parent 55c7c04
commit 397ad22
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/blueocean-web/src/main/resources/io/jenkins/blueocean/BlueOceanUI/index.jelly b/blueocean-web/src/main/resources/io/jenkins/blueocean/BlueOceanUI/index.jelly
@@ -14,7 +14,7 @@
         <j:invokeStatic var="j" className="jenkins.model.Jenkins" method="getActiveInstance"/>
         ${h.initPageVariables(context)}
 
-        <j:set var="isMSIE" value="${userAgent.contains('MSIE') || userAgent.contains('Trident')}"/>
+        <j:set var="isMSIE" value="${userAgent.contains('Edge') || userAgent.contains('MSIE') || userAgent.contains('Trident')}"/>
 
         <head lang="${it.lang}"
               data-rooturl="${rootURL}"

diff --git a/blueocean-web/src/main/webapp/scripts/ie-detect.js b/blueocean-web/src/main/webapp/scripts/ie-detect.js
@@ -62,7 +62,7 @@
     var incompatPageUrl = appurl + '/incompatibleie';
     var currentlyOnIncompatPage = (window.location.pathname === incompatPageUrl);
 
-    if (ieVersion.ActingVersion < 11) {
+    if (ieVersion.ActingVersion < 11 && !ieVersion.IsEdge) {
         if (!currentlyOnIncompatPage) {
             // Versions is too old and we're not already on the incompat page.
             // Redirect to the compatibility page.