diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2015-07-08 16:52:21 +0300 |
|---|---|---|
| committer | Johannes Dahlström <johannesd@vaadin.com> | 2015-07-09 13:25:17 +0300 |
| commit | 4fce93896627b862587533e4bd3b71b0e7a3a6b2 (patch) | |
| tree | e60c2c8dac5c82ac8a433c824785bc3495a7da1c /client | |
| parent | 7a5b61f19838dec76715026e5232c565082190a7 (diff) | |
| download | vaadin-framework-4fce93896627b862587533e4bd3b71b0e7a3a6b2.tar.gz vaadin-framework-4fce93896627b862587533e4bd3b71b0e7a3a6b2.zip | |
Close Grid editor on container item set change
Also allow user sorting when in unbuffered mode.
Change-Id: Ibe1c1770647529b63c6e3c7fc9509562449b54a4
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/com/vaadin/client/widgets/Grid.java | 5 |
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) { |