VFilterSelect now removes icon element from DOM if the icon is null. Previously it...

svn changeset:7930/svn branch:6.0

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
index 816168851313f76cce332551b2c95c82a73da4eb..01212a33a47edcde4351690568dbd494243f8519 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
@@ -567,7 +567,6 @@ public class VFilterSelect extends Composite implements Paintable, Field,
     private boolean focused = false;
 
     public VFilterSelect() {
-        selectedItemIcon.setVisible(false);
         selectedItemIcon.setStyleName("v-icon");
         selectedItemIcon.addLoadListener(new LoadListener() {
             public void onError(Widget sender) {
@@ -579,7 +578,6 @@ public class VFilterSelect extends Composite implements Paintable, Field,
             }
         });
 
-        panel.add(selectedItemIcon);
         tb.sinkEvents(VTooltip.TOOLTIP_EVENTS);
         panel.add(tb);
         panel.add(popupOpener);
@@ -787,12 +785,12 @@ public class VFilterSelect extends Composite implements Paintable, Field,
     }
 
     private void setSelectedItemIcon(String iconUri) {
-        if (iconUri == null) {
-            selectedItemIcon.setVisible(false);
+        if (iconUri == null || iconUri == "") {
+            panel.remove(selectedItemIcon);
             updateRootWidth();
         } else {
             selectedItemIcon.setUrl(iconUri);
-            selectedItemIcon.setVisible(true);
+            panel.insert(selectedItemIcon, 0);
             updateRootWidth();
             updateSelectedIconPosition();
         }