diff options
| author | Leif Åstrand <leif@vaadin.com> | 2014-12-18 18:30:09 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2014-12-18 18:30:09 +0200 |
| commit | e3d0fbbab68f9ef8642a975741d9f576993b1f38 (patch) | |
| tree | 5711a31c5af1d3773a86b4d25c9f8064aa435ecc /shared | |
| parent | 434fb5bf5cf62490686367e9193b7898077bbd44 (diff) | |
| parent | 68eec666b55c42b4a55235c00bc78f6212eb2062 (diff) | |
| download | vaadin-framework-e3d0fbbab68f9ef8642a975741d9f576993b1f38.tar.gz vaadin-framework-e3d0fbbab68f9ef8642a975741d9f576993b1f38.zip | |
Merge remote-tracking branch 'origin/master' into grid
Change-Id: Ic7629f9cedb3c948edf4f63c678ca499e3d52805
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 f144f9e48b..1c32a67c70 100644 --- a/shared/src/com/vaadin/shared/AbstractComponentState.java +++ b/shared/src/com/vaadin/shared/AbstractComponentState.java @@ -47,4 +47,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 e5b94d95c4..01ef9a038b 100644 --- a/shared/src/com/vaadin/shared/ui/button/ButtonState.java +++ b/shared/src/com/vaadin/shared/ui/button/ButtonState.java @@ -36,10 +36,6 @@ public class ButtonState extends TabIndexState { public boolean disableOnClick = false; @NoLayout public int clickShortcutKeyCode = 0; - /** - * If caption should be rendered in HTML - */ - public boolean htmlContentAllowed = false; @NoLayout 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; } |