aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/vaadin/terminal/gwt/server/BootstrapHandler.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java b/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java
index f3cd585b5a..84f87124d3 100644
--- a/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java
+++ b/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java
@@ -309,12 +309,17 @@ public abstract class BootstrapHandler implements RequestHandler {
+ "style=\"position:absolute;width:0;height:0;border:0;overflow:"
+ "hidden;\" src=\"javascript:false\"></iframe>");
+ String bootstrapLocation = staticFileLocation
+ + "/VAADIN/vaadinBootstrap.js";
page.write("<script type=\"text/javascript\" src=\"");
- page.write(staticFileLocation);
- page.write("/VAADIN/vaadinBootstrap.js\"></script>\n");
+ page.write(bootstrapLocation);
+ page.write("\"></script>\n");
page.write("<script type=\"text/javascript\">\n");
page.write("//<![CDATA[\n");
+ page.write("if (!window.vaadin) alert("
+ + JSONObject.quote("Failed to load the bootstrap javascript: "
+ + bootstrapLocation) + ");\n");
writeMainScriptTagContents(context);
page.write("//]]>\n</script>\n");