From: Joonas Lehtinen <joonas.lehtinen@itmill.com>
Date: Tue, 23 Jan 2007 12:24:22 +0000 (+0000)
Subject: Supports two form names: itmill and millstone side by side
X-Git-Tag: 6.7.0.beta1~6749
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f6a1ec08ef633b17640b35cd75fb038d70cbdf27;p=vaadin-framework.git

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 4096671216..22a883e218 100644
--- 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();"