aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur.signell@itmill.com>2009-09-24 06:25:11 +0000
committerArtur Signell <artur.signell@itmill.com>2009-09-24 06:25:11 +0000
commitdd7c498e036537572508ac3738dbdda5f9612b75 (patch)
tree49ce3a710810d28489b6c913d1e03c47a4d6009e
parent1ed019413c5fa59616e01315b7bb1750a3dd930c (diff)
downloadvaadin-framework-dd7c498e036537572508ac3738dbdda5f9612b75.tar.gz
vaadin-framework-dd7c498e036537572508ac3738dbdda5f9612b75.zip
Fix for #3383 - ComboBox input prompt style is removed when input prompt is active
svn changeset:8896/svn branch:6.1
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
index 998abc157f..5b834f9f4d 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
@@ -744,6 +744,12 @@ 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();
}
selectedOptionKey = null;