diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-01-06 11:33:08 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2012-01-06 11:33:08 +0200 |
| commit | 21f68204b9695e19b1face91c6f776f456802b15 (patch) | |
| tree | 5c60afdd8953f6289e038d67deea4f50848f4a46 | |
| parent | 5dde30a89f704a9fdb2aa4aa26a804531a1077b0 (diff) | |
| download | vaadin-framework-21f68204b9695e19b1face91c6f776f456802b15.tar.gz vaadin-framework-21f68204b9695e19b1face91c6f776f456802b15.zip | |
#8163 Print an error message if vaadinBootstap.js cannot be loaded
| -rw-r--r-- | src/com/vaadin/terminal/gwt/server/BootstrapHandler.java | 9 |
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"); |