From 29a7df25a5d2518b65ae058fa296a59d8fe9f2fb Mon Sep 17 00:00:00 2001
From: Jonatan Kronqvist <jonatan.kronqvist@itmill.com>
Date: Wed, 7 Jul 2010 12:33:47 +0000
Subject: Applied the patch from #4448

svn changeset:14140/svn branch:6.4
---
 .../vaadin/terminal/gwt/client/ui/VTextField.java  | 28 ++++++++++++++--------
 1 file changed, 18 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTextField.java b/src/com/vaadin/terminal/gwt/client/ui/VTextField.java
index 50c81e19bd..90d7d789a8 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTextField.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTextField.java
@@ -113,19 +113,11 @@ public class VTextField extends TextBoxBase implements Paintable, Field,
             setColumns(new Integer(uidl.getStringAttribute("cols")).intValue());
         }
 
-        String text = uidl.hasVariable("text") ? uidl.getStringVariable("text")
-                : null;
+        final String text = uidl.hasVariable("text") ? uidl
+                .getStringVariable("text") : null;
         setPrompting(inputPrompt != null && focusedTextField != this
                 && (text == null || text.equals("")));
 
-        final String fieldValue;
-        if (prompting) {
-            fieldValue = isReadOnly() ? "" : inputPrompt;
-            addStyleDependentName(CLASSNAME_PROMPT);
-        } else {
-            fieldValue = text;
-            removeStyleDependentName(CLASSNAME_PROMPT);
-        }
         if (BrowserInfo.get().isGecko()) {
             /*
              * Gecko is really sluggish when updating input attached to dom.
@@ -136,10 +128,26 @@ public class VTextField extends TextBoxBase implements Paintable, Field,
              */
             DeferredCommand.addCommand(new Command() {
                 public void execute() {
+                    String fieldValue;
+                    if (prompting) {
+                        fieldValue = isReadOnly() ? "" : inputPrompt;
+                        addStyleDependentName(CLASSNAME_PROMPT);
+                    } else {
+                        fieldValue = text;
+                        removeStyleDependentName(CLASSNAME_PROMPT);
+                    }
                     setText(fieldValue);
                 }
             });
         } else {
+            String fieldValue;
+            if (prompting) {
+                fieldValue = isReadOnly() ? "" : inputPrompt;
+                addStyleDependentName(CLASSNAME_PROMPT);
+            } else {
+                fieldValue = text;
+                removeStyleDependentName(CLASSNAME_PROMPT);
+            }
             setText(fieldValue);
         }
 
-- 
cgit v1.2.3