From 57fd06617af154b7e01f5ec79fad86e662908bdf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Leif=20=C3=85strand?= Date: Mon, 5 Nov 2012 11:00:47 +0000 Subject: [PATCH] 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 --- WebContent/VAADIN/vaadinBootstrap.js | 5 +- WebContent/statictestfiles/simpleEmbed.html | 55 --------------------- server/src/com/vaadin/ui/SimpleEmbed.html | 31 ------------ 3 files changed, 1 insertion(+), 90 deletions(-) delete mode 100644 WebContent/statictestfiles/simpleEmbed.html delete mode 100644 server/src/com/vaadin/ui/SimpleEmbed.html 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) { diff --git a/WebContent/statictestfiles/simpleEmbed.html b/WebContent/statictestfiles/simpleEmbed.html deleted file mode 100644 index 93dd6e7dfa..0000000000 --- a/WebContent/statictestfiles/simpleEmbed.html +++ /dev/null @@ -1,55 +0,0 @@ - - - - - -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 deleted file mode 100644 index 84d521c9b7..0000000000 --- a/server/src/com/vaadin/ui/SimpleEmbed.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - -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
- - -- 2.39.5