From: Leif Åstrand <leif@vaadin.com>
Date: Fri, 6 Jan 2012 09:33:08 +0000 (+0200)
Subject: #8163 Print an error message if vaadinBootstap.js cannot be loaded
X-Git-Tag: 7.0.0.alpha2~541^2~5
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=21f68204b9695e19b1face91c6f776f456802b15;p=vaadin-framework.git

#8163 Print an error message if vaadinBootstap.js cannot be loaded
---

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");