diff options
| author | Teemu Suo-Anttila <tsuoanttila@users.noreply.github.com> | 2018-06-19 10:49:40 +0300 |
|---|---|---|
| committer | Ilia Motornyi <elmot@vaadin.com> | 2018-06-19 09:49:40 +0200 |
| commit | c99ac74e86d3545cb3b580d73abcb582660808b6 (patch) | |
| tree | 654a0e7675573e46feba2e6ea1f89f8ab13050f4 /client | |
| parent | 7294ab52fe8a5fd389bac22eeaeeb3cec4f82fbb (diff) | |
| download | vaadin-framework-c99ac74e86d3545cb3b580d73abcb582660808b6.tar.gz vaadin-framework-c99ac74e86d3545cb3b580d73abcb582660808b6.zip | |
Fix TabSheet attaching and detaching components (#10988)
This patch reverts the fix #10557 and replaces it with a
proper solution from Grid perspective.
Fixes #10987
Fixes #10985
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/main/java/com/vaadin/client/connectors/grid/EditorConnector.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/client/src/main/java/com/vaadin/client/connectors/grid/EditorConnector.java b/client/src/main/java/com/vaadin/client/connectors/grid/EditorConnector.java index 31803c235c..76a79693ca 100644 --- a/client/src/main/java/com/vaadin/client/connectors/grid/EditorConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/grid/EditorConnector.java @@ -72,8 +72,11 @@ public class EditorConnector extends AbstractExtensionConnector { @Override public void cancel() { - serverInitiated = true; - getParent().getWidget().cancelEditor(); + // Canceling an editor that is not open is a no-op. + if (getParent().getWidget().isEditorActive()) { + serverInitiated = true; + getParent().getWidget().cancelEditor(); + } } @Override |