From 901a0bb7527a4c8b33dae7997c7754d01b33be7a Mon Sep 17 00:00:00 2001
From: Denis Anisimov <denis@vaadin.com>
Date: Wed, 9 Apr 2014 21:27:00 +0300
Subject: Don't use WindowConnector as a content connector in UI (#13127).

Change-Id: I17b963c49ba2d2de05341cf60dca0d65187314b0
---
 client/src/com/vaadin/client/ui/ui/UIConnector.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'client')

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) {
-- 
cgit v1.2.3