Fixes missing description text for button icon #12321

Change-Id: I88fea408e110dc454c8d37cf0e95e109e8d8c8d1

diff --git a/client/src/com/vaadin/client/ui/Icon.java b/client/src/com/vaadin/client/ui/Icon.java
index f02f0e10a8b5baaa291dd241a32ffc78a78c31f9..688507f52579b6d83ed46032ea7d44f751ddd7d6 100644 (file)
--- 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 fff983c1687da09691a084a3408d8730a581c779..b8bbf77cc1732125848b4ec280644fd987086319 100644 (file)
--- 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