#8230 #8917 Fix input prompt leaking to the field value in TextField and TextArea

svn changeset:24011/svn branch:6.8

1 files changed, 6 insertions, 1 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTextField.java b/src/com/vaadin/terminal/gwt/client/ui/VTextField.java
index d1e4f7ca5b..b05b9ba830 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTextField.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTextField.java
@@ -433,7 +433,7 @@ public class VTextField extends TextBoxBase implements Paintable, Field,
             if (!prompting && newText != null
                     && !newText.equals(valueBeforeEdit)) {
                 sendValueChange = immediate;
-                client.updateVariable(id, "text", getText(), false);
+                client.updateVariable(id, "text", newText, false);
                 valueBeforeEdit = newText;
                 valueBeforeEditIsSynced = true;
             }
@@ -500,6 +500,11 @@ public class VTextField extends TextBoxBase implements Paintable, Field,
     }
 
     public void onBlur(BlurEvent event) {
+        // this is called twice on Chrome when e.g. changing tab while prompting
+        // field focused - do not change settings on the second time
+        if (focusedTextField != this) {
+            return;
+        }
         removeStyleDependentName(CLASSNAME_FOCUS);
         focusedTextField = null;
         String text = getText();