Merge branch 'master' into grid-unbuffered-editor

Change-Id: I82cdb7a08a62679b4717d480b50ab951ade8855c

1 files changed, 5 insertions, 1 deletions

diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/com/vaadin/ui/Grid.java
index b0542352b9..64f26b6205 100644
--- a/server/src/com/vaadin/ui/Grid.java
+++ b/server/src/com/vaadin/ui/Grid.java
@@ -3627,6 +3627,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
     private final Footer footer = new Footer(this);
 
     private Object editedItemId = null;
+    private boolean editorActive = false;
     private FieldGroup editorFieldGroup = new CustomFieldGroup();
 
     private CellStyleGenerator cellStyleGenerator;
@@ -5803,7 +5804,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
      * @return true iff the editor is open
      */
     public boolean isEditorActive() {
-        return editedItemId != null;
+        return editorActive;
     }
 
     private void checkColumnExists(Object propertyId) {
@@ -5878,6 +5879,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
                     .getPropertyId());
         }
 
+        editorActive = true;
         // Must ensure that all fields, recursively, are sent to the client
         // This is needed because the fields are hidden using isRendered
         for (Field<?> f : getEditorFields()) {
@@ -5929,6 +5931,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
 
     protected void doCancelEditor() {
         editedItemId = null;
+        editorActive = false;
         editorFieldGroup.discard();
         editorFieldGroup.setItemDataSource(null);
     }
@@ -5946,6 +5949,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
         }
 
         editedItemId = null;
+        editorActive = false;
         editorFieldGroup = new CustomFieldGroup();
     }