Updated fix for #7560 to avoid breaking #6686 by not doing preventDefault if nothing...

svn changeset:21011/svn branch:6.6

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
index dd21c4f37243bb29ef48e4b3223ea1715528d4b5..0a6ad9c1f79c42bfcc4d5d08228572cd2f37a0ae 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
@@ -1253,6 +1253,12 @@ public class VFilterSelect extends Composite implements Paintable, Field,
                 // Same reaction to enter no matter on whether the popup is open
                 if (suggestionPopup.isAttached()) {
                     filterOptions(currentPage);
+                } else if (currentSuggestion != null
+                        && tb.getText().equals(
+                                currentSuggestion.getReplacementString())) {
+                    // Retain behavior from #6686 by returning without stopping
+                    // propagation if there's nothing to do
+                    return;
                 }
                 if (currentSuggestions.size() == 1 && !allowNewItem) {
                     // If there is only one suggestion, select that