diff options
| author | Henri Sara <hesara@vaadin.com> | 2014-01-16 10:56:09 +0200 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2014-01-16 10:56:09 +0200 |
| commit | 75c0e71549a68ba94c790f4ab611baa2200cc0e8 (patch) | |
| tree | dc1005f512e56a5967ca2212d5d7f5760b5ad882 | |
| parent | 73397508dbcf2256ac5199c18be2cf48d4e4cccc (diff) | |
| download | vaadin-framework-75c0e71549a68ba94c790f4ab611baa2200cc0e8.tar.gz vaadin-framework-75c0e71549a68ba94c790f4ab611baa2200cc0e8.zip | |
Un-revert "Changed the rendering order of TabSheet tabs to prevent an NPE in isClipped (#12343)"
This reverts commit 73397508dbcf2256ac5199c18be2cf48d4e4cccc.
| -rw-r--r-- | client/src/com/vaadin/client/ui/VTabsheet.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/client/src/com/vaadin/client/ui/VTabsheet.java b/client/src/com/vaadin/client/ui/VTabsheet.java index 6fd8fc4272..b65f058a46 100644 --- a/client/src/com/vaadin/client/ui/VTabsheet.java +++ b/client/src/com/vaadin/client/ui/VTabsheet.java @@ -840,6 +840,10 @@ public class VTabsheet extends VTabsheetBase implements Focusable, if (tab == null) { tab = tb.addTab(); } + if (selected) { + renderContent(tabUidl.getChildUIDL(0)); + tb.selectTab(index); + } tab.updateFromUIDL(tabUidl); tab.setEnabledOnServer((!disabledTabKeys.contains(tabKeys.get(index)))); tab.setHiddenOnServer(hidden); @@ -856,11 +860,6 @@ public class VTabsheet extends VTabsheetBase implements Focusable, * and tabs won't be too narrow in certain browsers */ tab.recalculateCaptionWidth(); - - if (selected) { - renderContent(tabUidl.getChildUIDL(0)); - tb.selectTab(index); - } } /** |