diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-09-24 16:31:08 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2012-09-24 16:36:07 +0300 |
| commit | 5f0952f60ed9d5b41a761ef0cd56c3ddc596d2b2 (patch) | |
| tree | 20ad3bbd2c06d5f3890d3ea12c1ac1f7c04eb9a6 /WebContent | |
| parent | 3adc8aa1a83e8f47c1195354c87c5caf78ccb905 (diff) | |
| download | vaadin-framework-5f0952f60ed9d5b41a761ef0cd56c3ddc596d2b2.tar.gz vaadin-framework-5f0952f60ed9d5b41a761ef0cd56c3ddc596d2b2.zip | |
Only use UI from web.xml for requests without additional path (#9722)
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/VAADIN/vaadinBootstrap.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/WebContent/VAADIN/vaadinBootstrap.js b/WebContent/VAADIN/vaadinBootstrap.js index 36cf2ec8eb..c8a2c03545 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); |