From: Leif Åstrand Date: Tue, 20 Dec 2011 08:09:40 +0000 (+0200) Subject: Add / to the base of the browser details request url X-Git-Tag: 7.0.0.alpha1~86 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e8856d80d800a1caccabc0199a765d3d5151f89a;p=vaadin-framework.git Add / to the base of the browser details request url --- 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');