summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN/vaadinBootstrap.js
diff options
context:
space:
mode:
Diffstat (limited to 'WebContent/VAADIN/vaadinBootstrap.js')
-rw-r--r--WebContent/VAADIN/vaadinBootstrap.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/WebContent/VAADIN/vaadinBootstrap.js b/WebContent/VAADIN/vaadinBootstrap.js
index 36cf2ec8eb..96c1b0e014 100644
--- a/WebContent/VAADIN/vaadinBootstrap.js
+++ b/WebContent/VAADIN/vaadinBootstrap.js
@@ -106,7 +106,10 @@
url += "&rootId=" + rootId;
}
- url += '&initialPath=' + encodeURIComponent(getConfig("initialPath"));
+ var initialPath = getConfig("initialPath");
+ if (initialPath === null) {
+ url += '&initialPath=' + encodeURIComponent(initialPath);
+ }
url += '&initialParams=' + encodeURIComponent(JSON.stringify(getConfig("initialParams")));
url += '&' + vaadin.getBrowserDetailsParameters(appId);
@@ -131,6 +134,8 @@
// Try bootstrapping again, this time without fetching missing info
bootstrapApp(false);
+ } else if (r.status == 500) {
+ document.write(r.responseText);
} else {
log('Error', r.statusText);
}