aboutsummaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorKnoobie <Knoobie@gmx.de>2017-08-10 07:54:36 +0200
committerHenri Sara <henri.sara@gmail.com>2017-08-10 08:54:36 +0300
commit9bb8e5c4cbf6adba3beaa87c6447e3f2866695fe (patch)
tree320746c693a48000cb14a82829921d3e4485030c /server
parent12e401b6a6d4b1393d0727bbfa393076079da157 (diff)
downloadvaadin-framework-9bb8e5c4cbf6adba3beaa87c6447e3f2866695fe.tar.gz
vaadin-framework-9bb8e5c4cbf6adba3beaa87c6447e3f2866695fe.zip
Remove Chrome Frame support from X-UA-Compatible (#9270)
Remove Chrome Frame specific part of X-UA-Compatible but keep the meta tag to override compatibility mode settings where applicable.
Diffstat (limited to 'server')
-rw-r--r--server/src/main/java/com/vaadin/server/BootstrapHandler.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/server/src/main/java/com/vaadin/server/BootstrapHandler.java b/server/src/main/java/com/vaadin/server/BootstrapHandler.java
index 13a4852164..1cba25fbf6 100644
--- a/server/src/main/java/com/vaadin/server/BootstrapHandler.java
+++ b/server/src/main/java/com/vaadin/server/BootstrapHandler.java
@@ -516,11 +516,8 @@ public abstract class BootstrapHandler extends SynchronizedRequestHandler {
head.appendElement("meta").attr("http-equiv", "Content-Type").attr(
"content", ApplicationConstants.CONTENT_TYPE_TEXT_HTML_UTF_8);
- /*
- * Enable Chrome Frame in all versions of IE if installed.
- */
- head.appendElement("meta").attr("http-equiv", "X-UA-Compatible")
- .attr("content", "IE=11;chrome=1");
+ // Force IE 11 to use IE 11 mode.
+ head.appendElement("meta").attr("http-equiv", "X-UA-Compatible").attr("content", "IE=11");
Class<? extends UI> uiClass = context.getUIClass();