diff options
| author | Artur <artur@vaadin.com> | 2017-02-22 13:36:45 +0200 |
|---|---|---|
| committer | Teemu Suo-Anttila <tsuoanttila@users.noreply.github.com> | 2017-03-16 16:21:24 +0200 |
| commit | c7d3e3859d444938f6d4f4b0dd563e2609e39762 (patch) | |
| tree | f3990df74c966bf8f2fcda0789f2f5f492eb5200 /client/src/main/java/com | |
| parent | 82af8b5bcc73500e69d5ebd6770f4360ebefbe87 (diff) | |
| download | vaadin-framework-c7d3e3859d444938f6d4f4b0dd563e2609e39762.tar.gz vaadin-framework-c7d3e3859d444938f6d4f4b0dd563e2609e39762.zip | |
Add support for rendering HTML in ButtonRenderer (#8606)
Diffstat (limited to 'client/src/main/java/com')
| -rw-r--r-- | client/src/main/java/com/vaadin/client/connectors/ButtonRendererConnector.java | 7 | ||||
| -rw-r--r-- | client/src/main/java/com/vaadin/client/renderers/ButtonRenderer.java | 16 |
2 files changed, 22 insertions, 1 deletions
diff --git a/client/src/main/java/com/vaadin/client/connectors/ButtonRendererConnector.java b/client/src/main/java/com/vaadin/client/connectors/ButtonRendererConnector.java index 6fbe428edc..170c32a616 100644 --- a/client/src/main/java/com/vaadin/client/connectors/ButtonRendererConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/ButtonRendererConnector.java @@ -16,6 +16,7 @@ package com.vaadin.client.connectors; import com.google.gwt.event.shared.HandlerRegistration; +import com.vaadin.client.communication.StateChangeEvent; import com.vaadin.client.renderers.ButtonRenderer; import com.vaadin.client.renderers.ClickableRenderer.RendererClickHandler; import com.vaadin.shared.ui.Connect; @@ -48,4 +49,10 @@ public class ButtonRendererConnector public ButtonRendererState getState() { return (ButtonRendererState) super.getState(); } + + @Override + public void onStateChanged(StateChangeEvent stateChangeEvent) { + super.onStateChanged(stateChangeEvent); + getRenderer().setHtmlContentAllowed(getState().htmlContentAllowed); + } } diff --git a/client/src/main/java/com/vaadin/client/renderers/ButtonRenderer.java b/client/src/main/java/com/vaadin/client/renderers/ButtonRenderer.java index 3c4560ff36..09d388dd93 100644 --- a/client/src/main/java/com/vaadin/client/renderers/ButtonRenderer.java +++ b/client/src/main/java/com/vaadin/client/renderers/ButtonRenderer.java @@ -29,6 +29,8 @@ import com.vaadin.client.widget.grid.RendererCellReference; */ public class ButtonRenderer extends ClickableRenderer<String, Button> { + private boolean htmlContentAllowed = false; + @Override public Button createWidget() { Button b = GWT.create(Button.class); @@ -37,8 +39,20 @@ public class ButtonRenderer extends ClickableRenderer<String, Button> { return b; } + public void setHtmlContentAllowed(boolean htmlContentAllowed) { + this.htmlContentAllowed = htmlContentAllowed; + } + + public boolean isHtmlContentAllowed() { + return htmlContentAllowed; + } + @Override public void render(RendererCellReference cell, String text, Button button) { - button.setText(text); + if (htmlContentAllowed) { + button.setHTML(text); + } else { + button.setText(text); + } } } |