diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-08-03 14:24:33 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2012-08-03 14:24:33 +0300 |
| commit | 94f81dc79526a257451c6638a0696e7505227cb7 (patch) | |
| tree | 13f094b896c74032ab86d079362a511f8ce478a1 /WebContent | |
| parent | 406c50ad6cbe537ce709b8958272f93c919e9653 (diff) | |
| parent | bc5831f069f648fbf0d89a863b28d80dc4c2bf35 (diff) | |
| download | vaadin-framework-94f81dc79526a257451c6638a0696e7505227cb7.tar.gz vaadin-framework-94f81dc79526a257451c6638a0696e7505227cb7.zip | |
Merge remote-tracking branch 'origin/6.8'
+ add @Override
Conflicts:
src/com/vaadin/terminal/gwt/client/Util.java
src/com/vaadin/terminal/gwt/client/ui/VOverlay.java
src/com/vaadin/terminal/gwt/client/ui/menubar/VMenuBar.java
src/com/vaadin/terminal/gwt/client/ui/popupview/VPopupView.java
src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java
src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
src/com/vaadin/ui/LoginForm.java
src/com/vaadin/ui/Table.java
tests/test.xml
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/statictestfiles/LoginFormIframe.html | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/WebContent/statictestfiles/LoginFormIframe.html b/WebContent/statictestfiles/LoginFormIframe.html new file mode 100644 index 0000000000..0d6ee9d86b --- /dev/null +++ b/WebContent/statictestfiles/LoginFormIframe.html @@ -0,0 +1,14 @@ +<!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"/> +<title>LoginForm</title> +<script type="text/javascript"> + window.name="LoginForm"; +</script> +</head> +<body> +<p>Tests that LoginForm can be submitted even when the Application is embedded inside an iframe</p> +<iframe src="/run/com.vaadin.tests.components.loginform.LoginFormTest?restartApplication" name="LoginForm" height="500px" width="500px"></iframe> +</body> +</html>
\ No newline at end of file |