From: Jani Laakso Date: Fri, 11 Apr 2008 18:25:39 +0000 (+0000) Subject: Fixed (partially) #1557: ApplicationServlet has broken javascript X-Git-Tag: 6.7.0.beta1~4901 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=17be12c38187515fd7b882647c6db8a5f8af6192;p=vaadin-framework.git Fixed (partially) #1557: ApplicationServlet has broken javascript svn changeset:4166/svn branch:trunk --- diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java index d6022536a4..ec7c10f483 100644 --- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java +++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java @@ -752,10 +752,6 @@ public class ApplicationServlet extends HttpServlet { + "html, body {height:100%;}"); page.write("" + title + ""); - if (testingApplication) { - writeTestingToolsScripts(page, request); - } - page.write("\n\n\n"); } @@ -790,7 +786,7 @@ public class ApplicationServlet extends HttpServlet { page.write("pathInfo: '" + pathInfo + "', "); page.write("themeUri:"); page.write(themeUri != null ? "'" + themeUri + "'" : "null"); - if (testingApplication) { + if (false && testingApplication) { page.write(", versionInfo : {toolkitVersion:\""); page.write(VERSION); page.write("\",applicationVersion:\""); @@ -799,6 +795,10 @@ public class ApplicationServlet extends HttpServlet { } page.write("};\n//]]>\n\n"); + if (testingApplication) { + writeTestingToolsScripts(page, request); + } + page.write("
\n"); if (!fragment) {