Supports two form names: itmill and millstone side by side

svn changeset:314/svn branch:toolkit

diff --git a/src/com/itmill/toolkit/terminal/web/ThemeFunctionLibrary.java b/src/com/itmill/toolkit/terminal/web/ThemeFunctionLibrary.java
index 4096671216f2e2f4fa0e2bd2b13d983ac28ed83a..22a883e21895aee3af225a3e6c1fba3799effb61 100644 (file)
--- a/src/com/itmill/toolkit/terminal/web/ThemeFunctionLibrary.java
+++ b/src/com/itmill/toolkit/terminal/web/ThemeFunctionLibrary.java
@@ -525,10 +525,10 @@ public class ThemeFunctionLibrary {
                                                WebBrowser.JAVASCRIPT_1_5) || browser
                                                .getJavaScriptVersion()
                                                .supports(WebBrowser.JSCRIPT_1_0))) {
-                       script += "try { form = win.document.forms[\"millstone\"];"
+                       script += "try { form = win.document.forms[\"itmill\"]; if (form == null) form = win.document.forms[\"millstone\"];"
                                        + "} catch (e) { form = null;}";
                } else {
-                       script += "form = win.document.forms[\"millstone\"];";
+                       script += "form = win.document.forms[\"itmill\"]; if (form == null) form = win.document.forms[\"millstone\"];";
                }
 
                script += "if (form != null) {" + "form.submit();"