Browse Source
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 38c2ad6ff4
tags/7.0.0.beta8
Leif Åstrand
11 years ago
3 changed files with 1 additions and 90 deletions
+ 1
- 4
WebContent/VAADIN/vaadinBootstrap.js
View File
| @@ -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) { | |||
+ 0
- 55
WebContent/statictestfiles/simpleEmbed.html
View File
| @@ -1,55 +0,0 @@ | |||
| <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> | |||
| <html xmlns="http://www.w3.org/1999/xhtml"> | |||
| <head> | |||
| <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> | |||
| <meta http-equiv="X-UA-Compatible" content="chrome=1" /> | |||
| <title>Simple embed</title> | |||
| <style type="text/css"> | |||
| html,body { | |||
| height: 100%; | |||
| margin: 0; | |||
| } | |||
| </style> | |||
| <link rel="shortcut icon" type="image/vnd.microsoft.icon" | |||
| href="/VAADIN/themes/reindeer/favicon.ico" /> | |||
| <link rel="icon" type="image/vnd.microsoft.icon" | |||
| href="/VAADIN/themes/reindeer/favicon.ico" /> | |||
| <script type="text/javascript" src="/VAADIN/vaadinBootstrap.js"></script> | |||
| </head> | |||
| <body scroll="auto" class=" v-generated-body"> | |||
| <span>MarginsInLabels</span> | |||
| <div style="width: 300px; height: 300px; border: 1px solid red;" | |||
| id="embedded" class=" v-app v-app-VaadinServletSession"> | |||
| <div class=" v-app-loading"></div> | |||
| <noscript>You have to enable javascript in your browser to | |||
| use an application built with Vaadin.</noscript> | |||
| </div> | |||
| <iframe tabindex="-1" id="__gwt_historyFrame" | |||
| style="position: absolute; width: 0; height: 0; border: 0; overflow: hidden" | |||
| src="javascript:false"></iframe> | |||
| <script type="text/javascript">//<![CDATA[ | |||
| if (!window.vaadin) alert("Failed to load the bootstrap javascript: ../VAADIN/vaadinBootstrap.js"); | |||
| vaadin.initApplication("embedded",{ | |||
| "heartbeatInterval": 300, | |||
| "versionInfo": {"vaadinVersion": "9.9.9.INTERNAL-DEBUG-BUILD"}, | |||
| "vaadinDir": "../VAADIN/", | |||
| "serviceUrl": "../embed2", | |||
| "authErrMsg": { | |||
| "message": "Take note of any unsaved data, and <u>click here<\/u> to continue.", | |||
| "caption": "Authentication problem" | |||
| }, | |||
| "widgetset": "com.vaadin.DefaultWidgetSet", | |||
| "theme": "reindeer", | |||
| "debug": true, | |||
| "comErrMsg": { | |||
| "message": "Take note of any unsaved data, and <u>click here<\/u> to continue.", | |||
| "caption": "Communication problem" | |||
| }, | |||
| "standalone": true | |||
| }); | |||
| //]]></script> | |||
| </body> | |||
| </html> | |||
+ 0
- 31
server/src/com/vaadin/ui/SimpleEmbed.html
View File
| @@ -1,31 +0,0 @@ | |||
| <?xml version="1.0" encoding="UTF-8"?> | |||
| <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> | |||
| <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> | |||
| <head profile="http://selenium-ide.openqa.org/profiles/test-case"> | |||
| <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> | |||
| <link rel="selenium.base" href="" /> | |||
| <title>New Test</title> | |||
| </head> | |||
| <body> | |||
| <table cellpadding="1" cellspacing="1" border="1"> | |||
| <thead> | |||
| <tr><td rowspan="1" colspan="3">New Test</td></tr> | |||
| </thead><tbody> | |||
| <tr> | |||
| <td>open</td> | |||
| <td>/statictestfiles/simpleEmbed.html</td> | |||
| <td></td> | |||
| </tr> | |||
| <tr> | |||
| <td>assertText</td> | |||
| <td>//span</td> | |||
| <td>MarginsInLabels</td> | |||
| </tr> | |||
| <tr> | |||
| <td>assertText</td> | |||
| <td>vaadin=embedded::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VLabel[0]/domChild[0]</td> | |||
| <td>Vertical layout</td> | |||
| </tr> | |||
| </tbody></table> | |||
| </body> | |||
| </html> | |||
Loading…