]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9f92df8)
Fixed (partially) #1557: ApplicationServlet has broken javascript
authorJani Laakso <jani.laakso@itmill.com>
Fri, 11 Apr 2008 18:25:39 +0000 (18:25 +0000)
committerJani Laakso <jani.laakso@itmill.com>
Fri, 11 Apr 2008 18:25:39 +0000 (18:25 +0000)
svn changeset:4166/svn branch:trunk

src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java patch | blob | history

diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
index d6022536a403e7c40ce6829cf6bd10d56dfc515c..ec7c10f483cbff95c22aaabd831dc19a98fbba60 100644 (file)
--- 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%;}</style>");
             page.write("<title>" + title + "</title>");
 
-            if (testingApplication) {
-                writeTestingToolsScripts(page, request);
-            }
-
             page.write("\n</head>\n<body class=\"i-generated-body\">\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</script>\n");
 
+        if (testingApplication) {
+            writeTestingToolsScripts(page, request);
+        }
+
         page.write("<div id=\"" + appId + "\" class=\"i-app\"></div>\n");
 
         if (!fragment) {
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework