Support font icons in MenuItems (#13372)

Change-Id: I2a85f77f68d701baa804bd3e6d55fa737bb4cc0e

diff --git a/client/src/com/vaadin/client/ui/VMenuBar.java b/client/src/com/vaadin/client/ui/VMenuBar.java
index 6c994777a71f7d0c4f12b64348655f1d0531b117..b6aee9277986b403c3ccc282987ace67b630233c 100644 (file)
--- a/client/src/com/vaadin/client/ui/VMenuBar.java
+++ b/client/src/com/vaadin/client/ui/VMenuBar.java
@@ -226,11 +226,9 @@ public class VMenuBar extends SimpleFocusablePanel implements
 
             itemHTML.append("<span class=\"" + getStylePrimaryName()
                     + "-menuitem-caption\">");
-            if (item.hasAttribute("icon")) {
-                itemHTML.append("<img src=\""
-                        + Util.escapeAttribute(client.translateVaadinUri(item
-                                .getStringAttribute("icon"))) + "\" class=\""
-                        + ImageIcon.CLASSNAME + "\" alt=\"\" />");
+            Icon icon = client.getIcon(item.getStringAttribute("icon"));
+            if (icon != null) {
+                itemHTML.append(icon.getElement().getString());
             }
             String itemText = item.getStringAttribute("text");
             if (!htmlContentAllowed) {