diff options
| author | Leif Åstrand <leif@vaadin.com> | 2011-12-20 10:09:40 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2011-12-20 10:09:40 +0200 |
| commit | e8856d80d800a1caccabc0199a765d3d5151f89a (patch) | |
| tree | e4baefaaef736168583191e8c0c920377319f57b /WebContent | |
| parent | 405eb983bf103428c1372ebdc07b0329a68c9541 (diff) | |
| download | vaadin-framework-e8856d80d800a1caccabc0199a765d3d5151f89a.tar.gz vaadin-framework-e8856d80d800a1caccabc0199a765d3d5151f89a.zip | |
Add / to the base of the browser details request url
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/VAADIN/vaadinBootstrap.js | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/WebContent/VAADIN/vaadinBootstrap.js b/WebContent/VAADIN/vaadinBootstrap.js index 6561e1ff79..f8eedb8fd1 100644 --- a/WebContent/VAADIN/vaadinBootstrap.js +++ b/WebContent/VAADIN/vaadinBootstrap.js @@ -82,7 +82,15 @@ var fetchRootConfig = function() { log('Fetching root config'); - var url = getConfig('browserDetailsUrl') || getConfig('appUri'); + var url = getConfig('browserDetailsUrl'); + if (!url) { + // No special url defined, use the default URL + url = getConfig('appUri'); + // Add a slash to the end, because ApplicationConiguration.loadFromDOM does so... + if (url.length == 0 || url.substr(url.length-1) !== "/") { + url += '/'; + } + } // Root id url += ((/\?/).test(url) ? "&" : "?") + "browserDetails"; url += '&rootId=' + getConfig('rootId'); |