diff options
Diffstat (limited to 'server/src/com/vaadin')
| -rw-r--r-- | server/src/com/vaadin/ui/Button.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/server/src/com/vaadin/ui/Button.java b/server/src/com/vaadin/ui/Button.java index 7063568f26..db78b04a28 100644 --- a/server/src/com/vaadin/ui/Button.java +++ b/server/src/com/vaadin/ui/Button.java @@ -689,8 +689,10 @@ public class Button extends AbstractComponent implements if (plain == null || !plain) { setHtmlContentAllowed(true); } - setIconAlternateText(DesignAttributeHandler.readAttribute("icon-alt", - attr, String.class)); + if (attr.hasKey("icon-alt")) { + setIconAlternateText(DesignAttributeHandler.readAttribute( + "icon-alt", attr, String.class)); + } // click-shortcut removeClickShortcut(); ShortcutAction action = DesignAttributeHandler.readAttribute( @@ -712,6 +714,7 @@ public class Button extends AbstractComponent implements result.add(DESIGN_ATTR_PLAIN_TEXT); result.add("caption"); result.add("icon-alt"); + result.add("icon-alternate-text"); result.add("click-shortcut"); result.add("html-content-allowed"); return result; |