diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/com/vaadin/client/ui/VPopupImpl.java | 7 | ||||
| -rw-r--r-- | client/src/com/vaadin/client/ui/VPopupImplMozilla.java | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/client/src/com/vaadin/client/ui/VPopupImpl.java b/client/src/com/vaadin/client/ui/VPopupImpl.java index 842025a94f..621069770a 100644 --- a/client/src/com/vaadin/client/ui/VPopupImpl.java +++ b/client/src/com/vaadin/client/ui/VPopupImpl.java @@ -8,8 +8,11 @@ public class VPopupImpl extends PopupImpl { @Override public void onShow(Element popup) { // Move the overlay to the appropriate overlay container - Element e = VOverlay.current.getOverlayContainer(); - e.appendChild(popup); + final VOverlay overlay = VOverlay.current; + if (overlay != null) { + final Element e = overlay.getOverlayContainer(); + e.appendChild(popup); + } super.onShow(popup); } diff --git a/client/src/com/vaadin/client/ui/VPopupImplMozilla.java b/client/src/com/vaadin/client/ui/VPopupImplMozilla.java index 4e5b46f056..7ae5c34e9e 100644 --- a/client/src/com/vaadin/client/ui/VPopupImplMozilla.java +++ b/client/src/com/vaadin/client/ui/VPopupImplMozilla.java @@ -8,8 +8,11 @@ public class VPopupImplMozilla extends PopupImplMozilla { @Override public void onShow(Element popup) { // Move the overlay to the appropriate overlay container - Element e = VOverlay.current.getOverlayContainer(); - e.appendChild(popup); + final VOverlay overlay = VOverlay.current; + if (overlay != null) { + final Element e = overlay.getOverlayContainer(); + e.appendChild(popup); + } super.onShow(popup); } |