aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/itmill/toolkit/terminal/web/WebBrowser.java3
-rw-r--r--src/com/itmill/toolkit/terminal/web/WebBrowserProbe.java7
2 files changed, 9 insertions, 1 deletions
diff --git a/src/com/itmill/toolkit/terminal/web/WebBrowser.java b/src/com/itmill/toolkit/terminal/web/WebBrowser.java
index 2dd270c249..7b194ac3e8 100644
--- a/src/com/itmill/toolkit/terminal/web/WebBrowser.java
+++ b/src/com/itmill/toolkit/terminal/web/WebBrowser.java
@@ -551,6 +551,8 @@ public class WebBrowser implements Terminal {
DEFAULT.new JavaScriptVersion("JScript 5.5", 155);
public static final JavaScriptVersion JSCRIPT_5_6 =
DEFAULT.new JavaScriptVersion("JScript 5.6", 156);
+ public static final JavaScriptVersion JSCRIPT_5_7 =
+ DEFAULT.new JavaScriptVersion("JScript 5.7", 157);
public static final JavaScriptVersion ECMA_262 =
DEFAULT.new JavaScriptVersion("ECMA-262", 262);
@@ -571,5 +573,6 @@ public class WebBrowser implements Terminal {
JSCRIPT_5_1,
JSCRIPT_5_5,
JSCRIPT_5_6,
+ JSCRIPT_5_7,
ECMA_262 };
}
diff --git a/src/com/itmill/toolkit/terminal/web/WebBrowserProbe.java b/src/com/itmill/toolkit/terminal/web/WebBrowserProbe.java
index 37edb6aeb8..62f9abc8e7 100644
--- a/src/com/itmill/toolkit/terminal/web/WebBrowserProbe.java
+++ b/src/com/itmill/toolkit/terminal/web/WebBrowserProbe.java
@@ -175,7 +175,12 @@ public class WebBrowserProbe {
// See Microsoft documentation for details:
// http://msdn.microsoft.com/library/default.asp?url=/library/
// en-us/script56/html/js56jsoriversioninformation.asp
- else if (agent.indexOf("MSIE 6.") >= 0) {
+ else if (agent.indexOf("MSIE 7.") >= 0) {
+ res.setJavaScriptVersion(WebBrowser.JSCRIPT_5_7);
+ res.setJavaEnabled(true);
+ res.setFrameSupport(true);
+ res.setMarkupVersion(WebBrowser.MARKUP_HTML_4_0);
+ } else if (agent.indexOf("MSIE 6.") >= 0) {
res.setJavaScriptVersion(WebBrowser.JSCRIPT_5_6);
res.setJavaEnabled(true);
res.setFrameSupport(true);