diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-11-05 11:00:47 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2012-11-05 11:00:55 +0000 |
| commit | 57fd06617af154b7e01f5ec79fad86e662908bdf (patch) | |
| tree | 5441006decbae35b613c172a78edc9d89ff5d044 /WebContent/VAADIN | |
| parent | 5cd3f64548037908979f740626022c88504fd701 (diff) | |
| download | vaadin-framework-57fd06617af154b7e01f5ec79fad86e662908bdf.tar.gz vaadin-framework-57fd06617af154b7e01f5ec79fad86e662908bdf.zip | |
Revert "Don't require browserDetailsUrl when embedding (#10122)"
The change caused the wrong URL to be included in some browser details requests.
This reverts commit 38c2ad6ff4895643371dfd00fb1d8667f6fc3909
Diffstat (limited to 'WebContent/VAADIN')
| -rw-r--r-- | WebContent/VAADIN/vaadinBootstrap.js | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/WebContent/VAADIN/vaadinBootstrap.js b/WebContent/VAADIN/vaadinBootstrap.js index 953fa44180..8c6e80a14f 100644 --- a/WebContent/VAADIN/vaadinBootstrap.js +++ b/WebContent/VAADIN/vaadinBootstrap.js @@ -78,15 +78,12 @@ }; var fetchRootConfig = function() { + log('Fetching root config'); var url = getConfig('browserDetailsUrl'); if (!url) { - url = getConfig('serviceUrl'); - } - if (!url) { // No special url defined, use the same URL that loaded this page (without the fragment) url = window.location.href.replace(/#.*/,''); } - log('Fetching root config from ' + url); url += ((/\?/).test(url) ? "&" : "?") + "browserDetails=1"; var rootId = getConfig("rootId"); if (rootId !== undefined) { |