From: Leif Åstrand Date: Fri, 2 Nov 2012 11:40:47 +0000 (+0200) Subject: Don't require browserDetailsUrl when embedding (#10122) X-Git-Tag: 7.0.0.beta8~11^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fchanges%2F98%2F198%2F1;p=vaadin-framework.git Don't require browserDetailsUrl when embedding (#10122) Change-Id: I2c6d5518d1e6adc4a502a8ad646e784f93ece4a3 --- 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) { diff --git a/WebContent/statictestfiles/simpleEmbed.html b/WebContent/statictestfiles/simpleEmbed.html new file mode 100644 index 0000000000..93dd6e7dfa --- /dev/null +++ b/WebContent/statictestfiles/simpleEmbed.html @@ -0,0 +1,55 @@ + + + + + +Simple embed + + + + + + + + MarginsInLabels +
+
+ +
+ + + + + + \ No newline at end of file diff --git a/server/src/com/vaadin/ui/SimpleEmbed.html b/server/src/com/vaadin/ui/SimpleEmbed.html new file mode 100644 index 0000000000..84d521c9b7 --- /dev/null +++ b/server/src/com/vaadin/ui/SimpleEmbed.html @@ -0,0 +1,31 @@ + + + + + + +New Test + + + + + + + + + + + + + + + + + + + + + +
New Test
open/statictestfiles/simpleEmbed.html
assertText//spanMarginsInLabels
assertTextvaadin=embedded::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VLabel[0]/domChild[0]Vertical layout
+ +