diff options
| author | John Ahlroos <john@vaadin.com> | 2012-09-25 13:12:35 +0300 |
|---|---|---|
| committer | John Ahlroos <john@vaadin.com> | 2012-09-25 13:12:35 +0300 |
| commit | 45cdaee31f3dcbe54d85d0c07b89fde1f212439b (patch) | |
| tree | 47dae5bb649834705f895d2f44f08fcc0743adfe /WebContent/VAADIN/vaadinBootstrap.js | |
| parent | cc3013a1e6e94872fb6ec07e756201495ec03ab6 (diff) | |
| parent | 8ad8ce15bbd2da69db70e384230f53db74443d22 (diff) | |
| download | vaadin-framework-45cdaee31f3dcbe54d85d0c07b89fde1f212439b.tar.gz vaadin-framework-45cdaee31f3dcbe54d85d0c07b89fde1f212439b.zip | |
Merge branch 'master' into primary-stylename
Diffstat (limited to 'WebContent/VAADIN/vaadinBootstrap.js')
| -rw-r--r-- | WebContent/VAADIN/vaadinBootstrap.js | 7 |
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); } |