Browse Source

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

Change-Id: I2c3843c078e72dc1f394b28ea7669cc232e1e739
tags/7.1.12
Teemu Suo-Anttila 10 years ago
parent
commit
98aff2bc7a
1 changed files with 4 additions and 2 deletions
  1. 4
    2
      client/src/com/vaadin/client/ui/orderedlayout/Slot.java

+ 4
- 2
client/src/com/vaadin/client/ui/orderedlayout/Slot.java View File

@@ -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

Loading…
Cancel
Save