From 38c2ad6ff4895643371dfd00fb1d8667f6fc3909 Mon Sep 17 00:00:00 2001 From: Leif Åstrand Date: Fri, 2 Nov 2012 13:40:47 +0200 Subject: Don't require browserDetailsUrl when embedding (#10122) Change-Id: I2c6d5518d1e6adc4a502a8ad646e784f93ece4a3 --- WebContent/VAADIN/vaadinBootstrap.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'WebContent/VAADIN/vaadinBootstrap.js') 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) { -- cgit v1.2.3