summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/widgets/Grid.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/client/src/com/vaadin/client/widgets/Grid.java b/client/src/com/vaadin/client/widgets/Grid.java
index 5cbfd5ea75..a0b0b08aaa 100644
--- a/client/src/com/vaadin/client/widgets/Grid.java
+++ b/client/src/com/vaadin/client/widgets/Grid.java
@@ -6627,7 +6627,7 @@ public class Grid<T> extends ResizeComposite implements
return true;
- } else if (editorIsActive && moveEvent) {
+ } else if (editorIsActive && !editor.isBuffered() && moveEvent) {
cellFocusHandler.setCellFocus(eventCell);
editor.editRow(eventCell.getRowIndex(),
@@ -6644,7 +6644,8 @@ public class Grid<T> extends ResizeComposite implements
return true;
}
- return editorIsActive;
+ // Swallow events if editor is open and buffered (modal)
+ return editor.isBuffered() && editorIsActive;
}
private boolean handleRendererEvent(Event event, RowContainer container) {