From: Marc Englund <marc.englund@itmill.com>
Date: Mon, 10 Dec 2007 15:18:38 +0000 (+0000)
Subject: "-" -> "" clientside as well.
X-Git-Tag: 6.7.0.beta1~5253
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6dbe6deb2460b0364736754890eaa08fd1387d41;p=vaadin-framework.git

"-" -> "" clientside as well.
One filtering bug fixed.

svn changeset:3208/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java
index ab42f2d1db..947d3dff37 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java
@@ -462,7 +462,7 @@ public class IFilterSelect extends Composite implements Paintable,
             return;
         }
         if (!filter.equals(lastFilter)) {
-            // we are on subsequant page and text has changed -> reset page
+            // we are on subsequent page and text has changed -> reset page
             page = 0;
         }
         if (clientSideFiltering) {
@@ -715,7 +715,7 @@ public class IFilterSelect extends Composite implements Paintable,
             if (currentSuggestion != null) {
                 tb.setText(currentSuggestion.getDisplayString());
             } else {
-                tb.setText("-");
+                tb.setText("");
             }
         }
     }
diff --git a/src/com/itmill/toolkit/ui/Select.java b/src/com/itmill/toolkit/ui/Select.java
index 4d0e85bd76..775d8614dd 100644
--- a/src/com/itmill/toolkit/ui/Select.java
+++ b/src/com/itmill/toolkit/ui/Select.java
@@ -144,8 +144,8 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering {
         target.startTag("options");
 
         final boolean paintNullSelection = needNullSelectOption
-                && (currentPage == 0 && (filterstring == null
-                        || filterstring.equals("") || filterstring.equals("-")));
+                && (currentPage == 0 && (filterstring == null || filterstring
+                        .equals("")));
 
         if (paintNullSelection) {
             target.startTag("so");
@@ -219,6 +219,7 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering {
     protected List getFilteredOptions() {
         if (filterstring == null || filterstring.equals("")
                 || filteringMode == FILTERINGMODE_OFF) {
+            prevfilterstring = null;
             filteredOptions = new LinkedList(getItemIds());
             return filteredOptions;
         }