diff options
| author | Juho Nurminen <juho@vaadin.com> | 2014-01-27 13:30:38 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-01-30 08:28:22 +0000 |
| commit | 69983d0aa0400a3c110e960d0f9da0ca0a59a094 (patch) | |
| tree | 719aec4be1863d6acbc99ae15e6138fb3646299f /client | |
| parent | b89dba9889353f0f553cb9583de6a9e8cb28302b (diff) | |
| download | vaadin-framework-69983d0aa0400a3c110e960d0f9da0ca0a59a094.tar.gz vaadin-framework-69983d0aa0400a3c110e960d0f9da0ca0a59a094.zip | |
Re-adjusted the rendering order of TabSheet tabs to prevent an NPE in isClipped (#12343)
Change-Id: I0705c02c12b5f0e998fda68fd7a144e45173a75e
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/com/vaadin/client/ui/VTabsheet.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/ui/VTabsheet.java b/client/src/com/vaadin/client/ui/VTabsheet.java index b65f058a46..a3d96983e8 100644 --- a/client/src/com/vaadin/client/ui/VTabsheet.java +++ b/client/src/com/vaadin/client/ui/VTabsheet.java @@ -841,8 +841,8 @@ public class VTabsheet extends VTabsheetBase implements Focusable, tab = tb.addTab(); } if (selected) { - renderContent(tabUidl.getChildUIDL(0)); tb.selectTab(index); + renderContent(tabUidl.getChildUIDL(0)); } tab.updateFromUIDL(tabUidl); tab.setEnabledOnServer((!disabledTabKeys.contains(tabKeys.get(index)))); |