From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Fri, 23 May 2008 07:20:49 +0000 (+0000)
Subject: enhancements to LoginForm
X-Git-Tag: 6.7.0.beta1~4712
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=db6e245b69c11be38504b8dbc4df633741fe468b;p=vaadin-framework.git

enhancements to LoginForm

svn changeset:4619/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/ui/LoginForm.java b/src/com/itmill/toolkit/ui/LoginForm.java
index 9397aa4e5f..e0f30774e4 100644
--- a/src/com/itmill/toolkit/ui/LoginForm.java
+++ b/src/com/itmill/toolkit/ui/LoginForm.java
@@ -122,8 +122,11 @@ public class LoginForm extends CustomComponent {
         return (""
                 + "<html>"
                 + "<head><script type='text/javascript'>"
-                + "var setTarget = function() {document.forms[0]"
-                + ".action = top.location;document.forms[0].username.focus();};"
+                + "var setTarget = function() {"
+                + "var uri = top.location.href;"
+                + "uri = uri.replace(/\\\\?.*/, '');"
+                + "uri += /loginHandler;"
+                + ".action = uri;document.forms[0].username.focus();};"
                 + "</script>"
                 + "<link rel='stylesheet' href='"
                 + guessedThemeUri
@@ -154,6 +157,9 @@ public class LoginForm extends CustomComponent {
         // response is handled. (May happen if login handler removes login
         // form
         window = getWindow();
+        if (window.getParent() != null) {
+            window = (Window) window.getParent();
+        }
         super.detach();
     }
 
