From 4fce93896627b862587533e4bd3b71b0e7a3a6b2 Mon Sep 17 00:00:00 2001
From: Johannes Dahlström <johannesd@vaadin.com>
Date: Wed, 8 Jul 2015 16:52:21 +0300
Subject: Close Grid editor on container item set change

Also allow user sorting when in unbuffered mode.

Change-Id: Ibe1c1770647529b63c6e3c7fc9509562449b54a4
---
 client/src/com/vaadin/client/widgets/Grid.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'client')

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) {
-- 
cgit v1.2.3