Fixed - MaterialLabel does not escape the given text. #497

Author: kevzlou7979

gwt-material/src/main/java/gwt/material/design/client/base/AbstractTextWidget.java

@@ -23,6 +23,7 @@
 import com.google.gwt.editor.client.IsEditor;
 import com.google.gwt.editor.client.LeafValueEditor;
 import com.google.gwt.editor.ui.client.adapters.HasTextEditor;
+import com.google.gwt.safehtml.shared.SafeHtmlUtils;
 import com.google.gwt.user.client.ui.HasHTML;
 
 /**
@@ -65,7 +66,7 @@ public String getHTML() {
 
     @Override
     public void setHTML(final String html) {
-        getElement().setInnerHTML(html);
+        getElement().setInnerSafeHtml(SafeHtmlUtils.fromString(html));
     }
 
     @Override

gwt-material/src/main/java/gwt/material/design/client/ui/MaterialBadge.java

@@ -20,6 +20,7 @@
 package gwt.material.design.client.ui;
 
 import com.google.gwt.dom.client.Document;
+import com.google.gwt.safehtml.shared.SafeHtmlUtils;
 import gwt.material.design.client.constants.Color;
 import gwt.material.design.client.constants.CssName;
 import gwt.material.design.client.ui.html.Span;
@@ -88,6 +89,6 @@ public String getText() {
 
     @Override
     public void setText(String text) {
-        getElement().setInnerHTML(text);
+        getElement().setInnerSafeHtml(SafeHtmlUtils.fromString(text));
     }
 }

gwt-material/src/main/java/gwt/material/design/client/ui/MaterialCollection.java

@@ -21,6 +21,7 @@
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.Document;
+import com.google.gwt.safehtml.shared.SafeHtmlUtils;
 import com.google.gwt.user.client.ui.Widget;
 import com.google.web.bindery.event.shared.HandlerRegistration;
 import gwt.material.design.client.base.HasActiveParent;
@@ -109,7 +110,7 @@ public MaterialCollection() {
      * Sets the header of the collection component.
      */
     public void setHeader(String header) {
-        span.getElement().setInnerHTML(header);
+        span.getElement().setInnerSafeHtml(SafeHtmlUtils.fromString(header));
         addStyleName(CssName.WITH_HEADER);
         ListItem item = new ListItem(span);
         UiHelper.addMousePressedHandlers(item);

gwt-material/src/main/java/gwt/material/design/client/ui/MaterialLabel.java

@@ -21,6 +21,7 @@
 
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.Style.Unit;
+import com.google.gwt.safehtml.shared.SafeHtmlUtils;
 import com.google.gwt.user.client.ui.HasText;
 import gwt.material.design.client.base.HasFontSize;
 import gwt.material.design.client.base.MaterialWidget;
@@ -83,6 +84,6 @@ public String getText() {
 
     @Override
     public void setText(String text) {
-        getElement().setInnerHTML(text);
+        getElement().setInnerSafeHtml(SafeHtmlUtils.fromString(text));
     }
 }

gwt-material/src/main/java/gwt/material/design/client/ui/MaterialTitle.java

@@ -20,6 +20,7 @@
 package gwt.material.design.client.ui;
 
 import com.google.gwt.dom.client.Style.Unit;
+import com.google.gwt.safehtml.shared.SafeHtmlUtils;
 import gwt.material.design.client.base.HasTitle;
 import gwt.material.design.client.constants.HeadingSize;
 import gwt.material.design.client.ui.html.Div;
@@ -74,6 +75,6 @@ public void setDescription(String description) {
 
     @Override
     public void setTitle(String title) {
-        header.getElement().setInnerHTML(title);
+        header.getElement().setInnerSafeHtml(SafeHtmlUtils.fromString(title));
     }
 }

gwt-material/src/main/java/gwt/material/design/client/ui/html/Span.java

@@ -21,6 +21,7 @@
 
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.Element;
+import com.google.gwt.safehtml.shared.SafeHtmlUtils;
 import com.google.gwt.user.client.ui.HasText;
 import gwt.material.design.client.base.MaterialWidget;
 
@@ -35,9 +36,9 @@ public Span(Element e, String... initialClass) {
         super(e, initialClass);
     }
 
-    public Span(String string) {
+    public Span(String text) {
         this();
-        getElement().setInnerHTML(string);
+        setText(text);
     }
 
     @Override
@@ -48,6 +49,6 @@ public String getText() {
     @Override
     public void setText(String text) {
         this.text = text;
-        getElement().setInnerHTML(text);
+        getElement().setInnerSafeHtml(SafeHtmlUtils.fromString(text));
     }
 }