diff options
| author | Artur Signell <artur.signell@itmill.com> | 2011-11-17 11:48:23 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2011-11-17 11:48:23 +0000 |
| commit | d418508bb6347c384478a25141064ed3c411ca1c (patch) | |
| tree | cc804bdfa7f33cee12c926c0a60ef22e11cac58c /src | |
| parent | b587b80cbd96da566b0359f61ffec4250e0a9d76 (diff) | |
| download | vaadin-framework-d418508bb6347c384478a25141064ed3c411ca1c.tar.gz vaadin-framework-d418508bb6347c384478a25141064ed3c411ca1c.zip | |
#6978 VFilterSelect should consume key events and should not pass them to action handlers when its suggestion popup is open
svn changeset:22036/svn branch:6.7
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java index 29e1221a06..7cc9ba374b 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java @@ -1509,6 +1509,10 @@ public class VFilterSelect extends Composite implements Paintable, Field, filterOptions(currentPage); // onBlur() takes care of the rest break; + case KeyCodes.KEY_ESCAPE: + reset(); + event.stopPropagation(); + break; case KeyCodes.KEY_ENTER: if (suggestionPopup.menu.getKeyboardSelectedItem() == null) { /* @@ -1560,10 +1564,8 @@ public class VFilterSelect extends Composite implements Paintable, Field, case KeyCodes.KEY_UP: case KeyCodes.KEY_PAGEDOWN: case KeyCodes.KEY_PAGEUP: - ; // NOP - break; case KeyCodes.KEY_ESCAPE: - reset(); + ; // NOP break; default: if (textInputEnabled) { |