diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-12-29 13:39:51 +0200 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-12-29 13:39:51 +0200 |
| commit | 181b598714e979ad26236a3677f9e825f74ca282 (patch) | |
| tree | cc178f0c3e5e971f2d7e071ea46f88d6aea0cdbe /shared | |
| parent | 0d93598759d2a1a95a25cc84e75cfa03f154590e (diff) | |
| parent | b89213ee880dd1197bc7696f6f5a1919c0ff02c1 (diff) | |
| download | vaadin-framework-181b598714e979ad26236a3677f9e825f74ca282.tar.gz vaadin-framework-181b598714e979ad26236a3677f9e825f74ca282.zip | |
Merge remote-tracking branch 'origin/master' into grid
Change-Id: Id00b3893951bc669fcc8e234f09909d480e249ab
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java b/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java index 69a3330f64..6059379dc5 100644 --- a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java +++ b/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java @@ -19,6 +19,7 @@ import java.util.ArrayList; import java.util.List; import com.vaadin.shared.AbstractComponentState; +import com.vaadin.shared.annotations.DelegateToWidget; import com.vaadin.shared.annotations.NoLayout; public class TabsheetState extends AbstractComponentState { @@ -43,4 +44,7 @@ public class TabsheetState extends AbstractComponentState { /** the key of the currently selected tab */ public String selected; + @DelegateToWidget + public boolean tabCaptionsAsHtml = false; + } |