diff options
| author | Joonas Lehtinen <joonas.lehtinen@itmill.com> | 2007-01-02 12:25:42 +0000 |
|---|---|---|
| committer | Joonas Lehtinen <joonas.lehtinen@itmill.com> | 2007-01-02 12:25:42 +0000 |
| commit | 12e96a4b7a9d7227d35fc0beda095a23455f49be (patch) | |
| tree | 5960e7d02b1e350b24fdefee43c4a6a1e189bcb7 /src/com/itmill/toolkit | |
| parent | 1f8bea7f7fac8ea22d618a36a51cfd9df24bc244 (diff) | |
| download | vaadin-framework-12e96a4b7a9d7227d35fc0beda095a23455f49be.tar.gz vaadin-framework-12e96a4b7a9d7227d35fc0beda095a23455f49be.zip | |
Added IE 7 decetion from Millstone Web Adapter
svn changeset:199/svn branch:toolkit
Diffstat (limited to 'src/com/itmill/toolkit')
| -rw-r--r-- | src/com/itmill/toolkit/terminal/web/WebBrowser.java | 3 | ||||
| -rw-r--r-- | src/com/itmill/toolkit/terminal/web/WebBrowserProbe.java | 7 |
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); |