diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-11-02 13:40:47 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2012-11-02 13:40:47 +0200 |
| commit | 38c2ad6ff4895643371dfd00fb1d8667f6fc3909 (patch) | |
| tree | 760c85adfd059009a3cbb62c8e237e370712dbd4 /WebContent/VAADIN/vaadinBootstrap.js | |
| parent | 4bbad2b320d4332e0e5e3fb03b4f37fcec1c6be7 (diff) | |
| download | vaadin-framework-38c2ad6ff4895643371dfd00fb1d8667f6fc3909.tar.gz vaadin-framework-38c2ad6ff4895643371dfd00fb1d8667f6fc3909.zip | |
Don't require browserDetailsUrl when embedding (#10122)
Change-Id: I2c6d5518d1e6adc4a502a8ad646e784f93ece4a3
Diffstat (limited to 'WebContent/VAADIN/vaadinBootstrap.js')
| -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 8c6e80a14f..953fa44180 100644 --- a/WebContent/VAADIN/vaadinBootstrap.js +++ b/WebContent/VAADIN/vaadinBootstrap.js @@ -78,12 +78,15 @@ }; 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) { |