diff options
| author | Henri Sara <hesara@vaadin.com> | 2014-01-15 11:14:04 +0200 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2014-01-15 11:14:04 +0200 |
| commit | 73397508dbcf2256ac5199c18be2cf48d4e4cccc (patch) | |
| tree | b98bd459531a5af5a1be7fc4fcf5748111506d5d | |
| parent | b9a6a48ab6ce9e3c7d8d025520e866643d19c004 (diff) | |
| download | vaadin-framework-73397508dbcf2256ac5199c18be2cf48d4e4cccc.tar.gz vaadin-framework-73397508dbcf2256ac5199c18be2cf48d4e4cccc.zip | |
Revert "Changed the rendering order of TabSheet tabs to prevent an NPE in isClipped (#12343)"
This reverts commit 5b56eeb521fdb92df5434647a8db27f0a45f09b9.
| -rw-r--r-- | client/src/com/vaadin/client/ui/VTabsheet.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/client/src/com/vaadin/client/ui/VTabsheet.java b/client/src/com/vaadin/client/ui/VTabsheet.java index b65f058a46..6fd8fc4272 100644 --- a/client/src/com/vaadin/client/ui/VTabsheet.java +++ b/client/src/com/vaadin/client/ui/VTabsheet.java @@ -840,10 +840,6 @@ 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); @@ -860,6 +856,11 @@ 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); + } } /** |