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 /src/com/vaadin/ui/LoginForm.java | |
| 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 'src/com/vaadin/ui/LoginForm.java')
| -rw-r--r-- | src/com/vaadin/ui/LoginForm.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/vaadin/ui/LoginForm.java b/src/com/vaadin/ui/LoginForm.java index 2d4513c5e3..db7e5f9dd9 100644 --- a/src/com/vaadin/ui/LoginForm.java +++ b/src/com/vaadin/ui/LoginForm.java @@ -91,7 +91,7 @@ public class LoginForm extends CustomComponent { response.setContentType("text/html; charset=utf-8"); response.getWriter() .write("<html><body>Login form handled." - + "<script type='text/javascript'>top.vaadin.forceSync();" + + "<script type='text/javascript'>parent.parent.vaadin.forceSync();" + "</script></body></html>"); Map<String, String[]> parameters = request.getParameterMap(); |