From: Teemu Suo-Anttila <teemusa@vaadin.com>
Date: Mon, 10 Feb 2014 13:57:20 +0000 (+0200)
Subject: Fix caption lost issue related to focus changing (#12967)
X-Git-Tag: 7.1.12~30
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=98aff2bc7af51b4c26b4b137f5971e8bdb0917c0;p=vaadin-framework.git

Fix caption lost issue related to focus changing (#12967)

Change-Id: I2c3843c078e72dc1f394b28ea7669cc232e1e739
---

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