diff options
| author | Artur Signell <artur@vaadin.com> | 2014-09-04 21:57:34 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2014-12-18 14:31:49 +0000 |
| commit | 1f2c9803152dc26a885067165a6b99a68d85700a (patch) | |
| tree | df827f64118d5cb38b81ff49c2c80cff61625998 /shared | |
| parent | 95333e50c65521476d3d166c8f255ccda14221e0 (diff) | |
| download | vaadin-framework-1f2c9803152dc26a885067165a6b99a68d85700a.tar.gz vaadin-framework-1f2c9803152dc26a885067165a6b99a68d85700a.zip | |
Allow captions to contain HTML (#9426)
Change-Id: I4a0e580aef1a97ce69238ea0d476599883928d84
Diffstat (limited to 'shared')
3 files changed, 1 insertions, 5 deletions
diff --git a/shared/src/com/vaadin/shared/AbstractComponentState.java b/shared/src/com/vaadin/shared/AbstractComponentState.java index 816af978cf..9e21954f3e 100644 --- a/shared/src/com/vaadin/shared/AbstractComponentState.java +++ b/shared/src/com/vaadin/shared/AbstractComponentState.java @@ -44,4 +44,5 @@ public class AbstractComponentState extends SharedState { // TODO this could be an object with more information, but currently the UI // only uses the message public String errorMessage = null; + public boolean captionAsHtml = false; } diff --git a/shared/src/com/vaadin/shared/ui/button/ButtonState.java b/shared/src/com/vaadin/shared/ui/button/ButtonState.java index a12136870c..5b099572df 100644 --- a/shared/src/com/vaadin/shared/ui/button/ButtonState.java +++ b/shared/src/com/vaadin/shared/ui/button/ButtonState.java @@ -33,9 +33,5 @@ public class ButtonState extends TabIndexState { } public boolean disableOnClick = false; public int clickShortcutKeyCode = 0; - /** - * If caption should be rendered in HTML - */ - public boolean htmlContentAllowed = false; public String iconAltText = ""; } diff --git a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerState.java b/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerState.java index 978b9a8417..3fdce20ce7 100644 --- a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerState.java +++ b/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerState.java @@ -36,5 +36,4 @@ public class ColorPickerState extends AbstractComponentState { public boolean showDefaultCaption; - public boolean htmlContentAllowed; } |