From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Tue, 17 Nov 2009 13:18:35 +0000 (+0000)
Subject: fixes #3721, avoid going into prompting mode even when field is focused
X-Git-Tag: 6.7.0.beta1~2289
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=69fc4620f0ab6b164e4b083e7c736d5be99c0308;p=vaadin-framework.git

fixes #3721, avoid going into prompting mode even when field is focused


svn changeset:9843/svn branch:6.2
---

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
index c349497aa3..35ba810484 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
@@ -756,13 +756,19 @@ public class VFilterSelect extends Composite implements Paintable, Field,
                 && uidl.getStringArrayVariable("selected").length == 0) {
             // select nulled
             if (!filtering || !popupOpenerClicked) {
-                /*
-                 * client.updateComponent overwrites all styles so we must
-                 * ALWAYS set the prompting style at this point, even though we
-                 * think it has been set already...
-                 */
-                prompting = false;
-                setPromptingOn();
+                if (!focused) {
+                    /*
+                     * client.updateComponent overwrites all styles so we must
+                     * ALWAYS set the prompting style at this point, even though
+                     * we think it has been set already...
+                     */
+                    prompting = false;
+                    setPromptingOn();
+                } else {
+                    // we have focus in field, prompting can't be set on,
+                    // instead just clear the input
+                    tb.setValue("");
+                }
             }
             selectedOptionKey = null;
         }