diff options
| author | Matti Hosio <mhosio@vaadin.com> | 2014-12-16 14:29:08 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-12-16 14:22:48 +0000 |
| commit | 1bfb901ad434d295f775c2fe34ac2cad4b2924e4 (patch) | |
| tree | aea34e8bd9e9edf7a85e0a0e75bce9d903a642e5 /server/src/com/vaadin/ui/AbstractSingleComponentContainer.java | |
| parent | 4db93af2d3f57809e3a9c66d72a398379afc2573 (diff) | |
| download | vaadin-framework-1bfb901ad434d295f775c2fe34ac2cad4b2924e4.tar.gz vaadin-framework-1bfb901ad434d295f775c2fe34ac2cad4b2924e4.zip | |
Do not write child components in sub templates (#7749)
Change-Id: I7e19e86618bbf27ae3a6e585bab000f26dd8f6d5
Diffstat (limited to 'server/src/com/vaadin/ui/AbstractSingleComponentContainer.java')
| -rw-r--r-- | server/src/com/vaadin/ui/AbstractSingleComponentContainer.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/server/src/com/vaadin/ui/AbstractSingleComponentContainer.java b/server/src/com/vaadin/ui/AbstractSingleComponentContainer.java index a646f17f23..034c285670 100644 --- a/server/src/com/vaadin/ui/AbstractSingleComponentContainer.java +++ b/server/src/com/vaadin/ui/AbstractSingleComponentContainer.java @@ -312,6 +312,11 @@ public abstract class AbstractSingleComponentContainer extends public void writeDesign(Element design, DesignContext designContext) { // synchronize default attributes (also clears children and attributes) super.writeDesign(design, designContext); + AbstractSingleComponentContainer def = designContext + .getDefaultInstance(this); + if (!designContext.shouldWriteChildren(this, def)) { + return; + } // handle child component Component child = getContent(); if (child != null) { |