Skip to content

Commit 5b43969

Browse files
committed
Fixed MaterialLabel does not escape the given text. #497
1 parent 3a52dca commit 5b43969

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

src/main/java/gwt/material/design/addins/client/richeditor/MaterialRichEditor.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
import com.google.gwt.event.logical.shared.HasValueChangeHandlers;
2828
import com.google.gwt.event.logical.shared.ValueChangeEvent;
2929
import com.google.gwt.event.shared.HandlerRegistration;
30+
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
31+
import com.google.gwt.safehtml.shared.SafeHtmlUtils;
3032
import gwt.material.design.addins.client.MaterialAddins;
3133
import gwt.material.design.addins.client.richeditor.base.HasPasteHandlers;
3234
import gwt.material.design.addins.client.richeditor.base.MaterialRichEditorBase;
@@ -185,7 +187,7 @@ public void insertText(String text) {
185187
* Insert custom text inside the note zone.
186188
*/
187189
protected void insertText(Element e, String text) {
188-
$(e).materialnote("insertText", text);
190+
$(e).materialnote("insertText", SafeHtmlUtils.fromString(text).asString());
189191
}
190192

191193
/**

src/main/java/gwt/material/design/addins/client/richeditor/base/MaterialRichEditorBase.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.google.gwt.dom.client.Document;
2424
import com.google.gwt.dom.client.Element;
2525
import com.google.gwt.event.shared.HandlerRegistration;
26+
import com.google.gwt.safehtml.shared.SafeHtmlUtils;
2627
import com.google.gwt.user.client.ui.HasHTML;
2728
import gwt.material.design.addins.client.base.constants.AddinsCssName;
2829
import gwt.material.design.addins.client.richeditor.base.constants.ToolbarButton;
@@ -203,7 +204,7 @@ public String getText() {
203204

204205
@Override
205206
public void setText(String text) {
206-
getElement().setInnerText(text);
207+
getElement().setInnerSafeHtml(SafeHtmlUtils.fromString(text));
207208
}
208209

209210
protected String getHTMLCode(Element e) {

src/main/java/gwt/material/design/addins/client/stepper/MaterialStep.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import com.google.gwt.event.logical.shared.SelectionEvent;
2626
import com.google.gwt.event.logical.shared.SelectionHandler;
2727
import com.google.gwt.event.shared.HandlerRegistration;
28+
import com.google.gwt.safehtml.shared.SafeHtmlUtils;
2829
import com.google.gwt.user.client.ui.Widget;
2930
import gwt.material.design.addins.client.base.constants.AddinsCssName;
3031
import gwt.material.design.client.base.*;
@@ -135,13 +136,13 @@ public int getStep() {
135136

136137
public void setStep(int step) {
137138
this.step = step;
138-
divCircle.getElement().setInnerHTML(String.valueOf(step));
139+
divCircle.getElement().setInnerSafeHtml(SafeHtmlUtils.fromString(String.valueOf(step)));
139140
}
140141

141142
@Override
142143
public void setTitle(String title) {
143144
this.title = title;
144-
divTitle.getElement().setInnerHTML(title);
145+
divTitle.getElement().setInnerSafeHtml(SafeHtmlUtils.fromString(title));
145146
}
146147

147148
public String getTitle() {
@@ -152,7 +153,7 @@ public String getTitle() {
152153
public void setDescription(String description) {
153154
this.description = description;
154155
divDescription.setStyleName(AddinsCssName.DESCRIPTION);
155-
divDescription.getElement().setInnerHTML(description);
156+
divDescription.getElement().setInnerSafeHtml(SafeHtmlUtils.fromString(description));
156157
conBody.insert(divDescription, 1);
157158
}
158159

@@ -203,7 +204,7 @@ protected void applyIconStatus(MaterialIcon icon, String description) {
203204
iconSuccess.removeFromParent();
204205
divCircle.removeFromParent();
205206
conCircle.insert(icon, 0);
206-
divDescription.getElement().setInnerHTML(description);
207+
divDescription.getElement().setInnerSafeHtml(SafeHtmlUtils.fromString(description));
207208
}
208209

209210
public Div getDivBody() {

0 commit comments

Comments
 (0)