diff options
| author | John Ahlroos <john@vaadin.com> | 2013-08-06 10:23:03 +0300 |
|---|---|---|
| committer | John Ahlroos <john@vaadin.com> | 2013-08-06 10:23:03 +0300 |
| commit | 437b6de4eea416317bd79399a5dde9870b306975 (patch) | |
| tree | fc6f59ba4a8c0521754e7ee9be84e84e066328b1 /client | |
| parent | bd923f394c7b60ea912558201bf5afd710285722 (diff) | |
| download | vaadin-framework-437b6de4eea416317bd79399a5dde9870b306975.tar.gz vaadin-framework-437b6de4eea416317bd79399a5dde9870b306975.zip | |
Fixes missing description text for button icon #12321
Change-Id: I88fea408e110dc454c8d37cf0e95e109e8d8c8d1
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/com/vaadin/client/ui/Icon.java | 6 | ||||
| -rw-r--r-- | client/src/com/vaadin/client/ui/button/ButtonConnector.java | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/client/src/com/vaadin/client/ui/Icon.java b/client/src/com/vaadin/client/ui/Icon.java index f02f0e10a8..688507f525 100644 --- a/client/src/com/vaadin/client/ui/Icon.java +++ b/client/src/com/vaadin/client/ui/Icon.java @@ -60,7 +60,11 @@ public class Icon extends UIObject { myUri = uidlUri; } - setAlternateText(uidlAlt); + if (uidlAlt != null) { + setAlternateText(uidlAlt); + } else { + setAlternateText(""); + } } /** diff --git a/client/src/com/vaadin/client/ui/button/ButtonConnector.java b/client/src/com/vaadin/client/ui/button/ButtonConnector.java index fff983c168..b8bbf77cc1 100644 --- a/client/src/com/vaadin/client/ui/button/ButtonConnector.java +++ b/client/src/com/vaadin/client/ui/button/ButtonConnector.java @@ -24,7 +24,6 @@ import com.google.gwt.event.dom.client.FocusEvent; import com.google.gwt.event.dom.client.FocusHandler; import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.user.client.DOM; -import com.google.gwt.user.client.Element; import com.vaadin.client.EventHelper; import com.vaadin.client.MouseEventDetailsBuilder; import com.vaadin.client.communication.StateChangeEvent; @@ -84,13 +83,11 @@ public class ButtonConnector extends AbstractComponentConnector implements if (getIcon() != null) { if (getWidget().icon == null) { getWidget().icon = new Icon(getConnection()); - Element iconElement = getWidget().icon.getElement(); - iconElement.setAttribute("alt", getState().iconAltText); - - getWidget().wrapper.insertBefore(iconElement, + getWidget().wrapper.insertBefore( + getWidget().icon.getElement(), getWidget().captionElement); } - getWidget().icon.setUri(getIcon()); + getWidget().icon.setUri(getIcon(), getState().iconAltText); } else { if (getWidget().icon != null) { getWidget().wrapper.removeChild(getWidget().icon |