diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-01-12 11:28:55 +0200 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-01-12 11:28:55 +0200 |
| commit | 2286f9871f7f77dea6139d0cd1dfc6754b1946d5 (patch) | |
| tree | c8a978d77dff74788b5a290f6c7928e39932b8a5 /shared | |
| parent | 35d91245de3218283c8f4c733a3aa72ea395fb1c (diff) | |
| parent | 3f27e02f121c0a39b217532afcf9530bfd2caba7 (diff) | |
| download | vaadin-framework-2286f9871f7f77dea6139d0cd1dfc6754b1946d5.tar.gz vaadin-framework-2286f9871f7f77dea6139d0cd1dfc6754b1946d5.zip | |
Merge remote-tracking branch 'origin/master' into grid
Change-Id: Ic6b667ea6ceff43a609ce2037f656c6274871fb7
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/src/com/vaadin/shared/ui/calendar/CalendarState.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/shared/src/com/vaadin/shared/ui/calendar/CalendarState.java b/shared/src/com/vaadin/shared/ui/calendar/CalendarState.java index 93bd05bc1e..c26c4ead16 100644 --- a/shared/src/com/vaadin/shared/ui/calendar/CalendarState.java +++ b/shared/src/com/vaadin/shared/ui/calendar/CalendarState.java @@ -38,6 +38,7 @@ public class CalendarState extends AbstractComponentState { public List<CalendarState.Day> days; public List<CalendarState.Event> events; public List<CalendarState.Action> actions; + public boolean eventCaptionAsHtml; public static class Day implements java.io.Serializable { public String date; |