diff options
Diffstat (limited to 'src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java index c6d286ed03..ffa34b11cd 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java @@ -1929,11 +1929,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements if (!isProductionMode()) { page.write("vaadin.debug = true;\n"); } - page.write("document.write('<iframe tabIndex=\"-1\" id=\"__gwt_historyFrame\" " - + "style=\"position:absolute;width:0;height:0;border:0;overflow:" - + "hidden;\" src=\"javascript:false\"></iframe>');\n"); - page.write("document.write(\"<script language='javascript' src='" - + widgetsetFilePath + "'><\\/script>\");\n}\n"); + page.write("}\n"); page.write("vaadin.vaadinConfigurations[\"" + appId + "\"] = {"); page.write("appUri:'" + appUrl + "', "); @@ -1991,6 +1987,12 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements } page.write("};\n//]]>\n</script>\n"); + page.write("<iframe tabIndex='-1' id='__gwt_historyFrame' " + + "style='position:absolute;width:0;height:0;border:0;overflow:" + + "hidden;' src='javascript:false'></iframe>\n"); + page.write("<script language='javascript' src='" + widgetsetFilePath + + "'></script>\n"); + if (themeName != null) { // Custom theme's stylesheet, load only once, in different // script |