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 | |
| parent | 4bbad2b320d4332e0e5e3fb03b4f37fcec1c6be7 (diff) | |
| download | vaadin-framework-38c2ad6ff4895643371dfd00fb1d8667f6fc3909.tar.gz vaadin-framework-38c2ad6ff4895643371dfd00fb1d8667f6fc3909.zip | |
Don't require browserDetailsUrl when embedding (#10122)
Change-Id: I2c6d5518d1e6adc4a502a8ad646e784f93ece4a3
| -rw-r--r-- | WebContent/VAADIN/vaadinBootstrap.js | 5 | ||||
| -rw-r--r-- | WebContent/statictestfiles/simpleEmbed.html | 55 | ||||
| -rw-r--r-- | server/src/com/vaadin/ui/SimpleEmbed.html | 31 |
3 files changed, 90 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) { 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 @@ +<!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>
\ 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 @@ +<?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> |