Skip to content

Commit 4de111d

Browse files
committed
Merge branch 'release_2.0' of https://github.com/GwtMaterialDesign/gwt-material into release_2.0
2 parents 86c6b06 + 3d4b69a commit 4de111d

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
*/
2020
package gwt.material.design.client.ui;
2121

22+
import com.google.gwt.dom.client.Element;
2223
import com.google.gwt.event.shared.HandlerRegistration;
2324
import com.google.gwt.user.client.ui.*;
2425
import gwt.material.design.client.base.HasId;
@@ -317,12 +318,16 @@ public void setHtml(String html) {
317318
htmlAttachHandler = null;
318319
}
319320

320-
JsMaterialElement element = JsMaterialElement.$("#" + widget.getElement().getAttribute("data-tooltip-id"));
321+
Element element = widget.getElement();
321322
if (widget.isAttached()) {
322-
element.find("span").html(html != null ? html : "");
323+
JsMaterialElement.$("#" + element.getAttribute("data-tooltip-id"))
324+
.find("span")
325+
.html(html != null ? html : "");
323326
} else {
324327
htmlAttachHandler = widget.addAttachHandler(attachEvent -> {
325-
element.find("span").html(html != null ? html : "");
328+
JsMaterialElement.$("#" + element.getAttribute("data-tooltip-id"))
329+
.find("span")
330+
.html(html != null ? html : "");
326331
});
327332
}
328333
}

0 commit comments

Comments
 (0)