summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorDenis Anisimov <denis@vaadin.com>2014-04-09 21:27:00 +0300
committerVaadin Code Review <review@vaadin.com>2014-04-09 18:48:24 +0000
commit901a0bb7527a4c8b33dae7997c7754d01b33be7a (patch)
tree0991d1c012a475e76e64f44107d0a98d73bf1919 /client
parent52db8e5457e1afcb56a5047adbddf15c44754e8c (diff)
downloadvaadin-framework-901a0bb7527a4c8b33dae7997c7754d01b33be7a.tar.gz
vaadin-framework-901a0bb7527a4c8b33dae7997c7754d01b33be7a.zip
Don't use WindowConnector as a content connector in UI (#13127).
Change-Id: I17b963c49ba2d2de05341cf60dca0d65187314b0
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/ui/ui/UIConnector.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/client/src/com/vaadin/client/ui/ui/UIConnector.java b/client/src/com/vaadin/client/ui/ui/UIConnector.java
index 093b508aea..576f50d018 100644
--- a/client/src/com/vaadin/client/ui/ui/UIConnector.java
+++ b/client/src/com/vaadin/client/ui/ui/UIConnector.java
@@ -504,6 +504,18 @@ public class UIConnector extends AbstractSingleComponentContainerConnector
return (VUI) super.getWidget();
}
+ @Override
+ protected ComponentConnector getContent() {
+ ComponentConnector connector = super.getContent();
+ // VWindow (WindowConnector is its connector)is also a child component
+ // but it's never a content widget
+ if (connector instanceof WindowConnector) {
+ return null;
+ } else {
+ return connector;
+ }
+ }
+
protected void onChildSizeChange() {
ComponentConnector child = getContent();
if (child == null) {