diff options
| author | John Ahlroos <john@vaadin.com> | 2012-11-06 08:48:55 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2012-11-06 08:48:55 +0000 |
| commit | 755fe2074bc59ad7079979e11d9a9d809e632857 (patch) | |
| tree | 07aecd9a27554401bf7460872d647470bfeeac5a /client | |
| parent | 96b03a07b81242892fc3e51f28a33bf6c78d900a (diff) | |
| parent | 71080f99e0f364ba2a4315b53d76d711eedca7e4 (diff) | |
| download | vaadin-framework-755fe2074bc59ad7079979e11d9a9d809e632857.tar.gz vaadin-framework-755fe2074bc59ad7079979e11d9a9d809e632857.zip | |
Merge "Fix for #10126 - npe when using 'plain GWT' popup panel. Applied patch by mgrankvi, and also did the same change to the mozilla variant."7.0.0.beta8
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); } |