diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-02-10 15:57:20 +0200 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-02-10 15:57:20 +0200 |
| commit | 98aff2bc7af51b4c26b4b137f5971e8bdb0917c0 (patch) | |
| tree | 40620b98031c7f32f024d504489501e8b6935a8d | |
| parent | 65052825df68c109d290bb12ca28b18a2ea613fe (diff) | |
| download | vaadin-framework-98aff2bc7af51b4c26b4b137f5971e8bdb0917c0.tar.gz vaadin-framework-98aff2bc7af51b4c26b4b137f5971e8bdb0917c0.zip | |
Fix caption lost issue related to focus changing (#12967)
Change-Id: I2c3843c078e72dc1f394b28ea7669cc232e1e739
| -rw-r--r-- | client/src/com/vaadin/client/ui/orderedlayout/Slot.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/client/src/com/vaadin/client/ui/orderedlayout/Slot.java b/client/src/com/vaadin/client/ui/orderedlayout/Slot.java index 37a97f3399..efa19895a8 100644 --- a/client/src/com/vaadin/client/ui/orderedlayout/Slot.java +++ b/client/src/com/vaadin/client/ui/orderedlayout/Slot.java @@ -474,7 +474,8 @@ public final class Slot extends SimplePanel { // Made changes to DOM. Focus can be lost if it was in the // widget. - focusLost = widget.getElement().isOrHasChild(focusedElement); + focusLost = (focusedElement == null ? false : widget + .getElement().isOrHasChild(focusedElement)); } } else if (caption != null) { orphan(widget); @@ -485,7 +486,8 @@ public final class Slot extends SimplePanel { captionWrap = null; // Made changes to DOM. Focus can be lost if it was in the widget. - focusLost = widget.getElement().isOrHasChild(focusedElement); + focusLost = (focusedElement == null ? false : widget.getElement() + .isOrHasChild(focusedElement)); } // Caption text |