diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-08-04 12:59:42 +0300 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-08-06 06:10:04 +0000 |
| commit | 6aa1aab8a77b5aece4eb34fcf447baa129380de0 (patch) | |
| tree | 033d2e1477e8b1d880482efc2f2ca9e3db2ce472 | |
| parent | df68ce33bde680de12cdf6457311c35662252da2 (diff) | |
| download | vaadin-framework-6aa1aab8a77b5aece4eb34fcf447baa129380de0.tar.gz vaadin-framework-6aa1aab8a77b5aece4eb34fcf447baa129380de0.zip | |
Handle navigation events only if Grid has focus (#13334)
Change-Id: Ia3fa7463b92e0b2a7a5b61e1e270996ef7d6bb6e
| -rw-r--r-- | client/src/com/vaadin/client/ui/grid/Grid.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/client/src/com/vaadin/client/ui/grid/Grid.java b/client/src/com/vaadin/client/ui/grid/Grid.java index f280b26493..a32a31b029 100644 --- a/client/src/com/vaadin/client/ui/grid/Grid.java +++ b/client/src/com/vaadin/client/ui/grid/Grid.java @@ -1923,8 +1923,10 @@ public class Grid<T> extends Composite implements } } - if (activeCellHandler.getNavigationEvents().contains( - event.getType())) { + Collection<String> navigation = activeCellHandler + .getNavigationEvents(); + if (navigation.contains(event.getType()) + && (Util.getFocusedElement() == getElement() || cell != null)) { activeCellHandler.handleNavigationEvent(event, cell); } } |