diff options
| author | Anna Miroshnik <anna.miroshnik@arcadia.spb.ru> | 2014-08-20 14:47:39 +0400 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-08-21 07:59:11 +0000 |
| commit | f247e5bb9d84326771327d619ce501c7ba2909fd (patch) | |
| tree | 1565e2c2093f82794c7c257b8b864089e901705b /client | |
| parent | 8476b57ce2261313f47b21764ddc02cc128b2fd4 (diff) | |
| download | vaadin-framework-f247e5bb9d84326771327d619ce501c7ba2909fd.tar.gz vaadin-framework-f247e5bb9d84326771327d619ce501c7ba2909fd.zip | |
Fix CustomLayout: component not added at the default location (#14340)
Change-Id: I5eb76915b52f6b73ff0799631d98d5711041eeb5
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/com/vaadin/client/ui/VCustomLayout.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/client/src/com/vaadin/client/ui/VCustomLayout.java b/client/src/com/vaadin/client/ui/VCustomLayout.java index f9caceb668..3b2b007b5b 100644 --- a/client/src/com/vaadin/client/ui/VCustomLayout.java +++ b/client/src/com/vaadin/client/ui/VCustomLayout.java @@ -208,12 +208,10 @@ public class VCustomLayout extends ComplexPanel { /** Collect locations from template */ private void scanForLocations(Element elem) { - - final String location = elem.getAttribute("location"); - if (!"".equals(location)) { + if (elem.hasAttribute("location")) { + final String location = elem.getAttribute("location"); locationToElement.put(location, elem); elem.setInnerHTML(""); - } else { final int len = DOM.getChildCount(elem); for (int i = 0; i < len; i++) { |