diff options
| author | Ilia Motornyi <elmot@vaadin.com> | 2015-03-17 11:47:53 +0200 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-05-28 14:59:49 +0000 |
| commit | 96c08cd52e13e6d2ba5fee0580e9c2c7a5091a0f (patch) | |
| tree | c78fc9b1b6b0126271279380c0d9f2d1d814c2dd /client | |
| parent | 550bd1e5e42b97de54ebcd02fda17325d52ef67d (diff) | |
| download | vaadin-framework-96c08cd52e13e6d2ba5fee0580e9c2c7a5091a0f.tar.gz vaadin-framework-96c08cd52e13e6d2ba5fee0580e9c2c7a5091a0f.zip | |
Adds a textual null representation to Grid renderers(#16560)7.5.0.beta2
Adds an optional textual value for null to Grid.AbstractRenderer
Change-Id: I4998476308e4259306f1774f309968520d8672e5
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/com/vaadin/client/connectors/ImageRendererConnector.java | 6 | ||||
| -rw-r--r-- | client/src/com/vaadin/client/renderers/ImageRenderer.java | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/client/src/com/vaadin/client/connectors/ImageRendererConnector.java b/client/src/com/vaadin/client/connectors/ImageRendererConnector.java index ef54daaaa1..f7690cb6fe 100644 --- a/client/src/com/vaadin/client/connectors/ImageRendererConnector.java +++ b/client/src/com/vaadin/client/connectors/ImageRendererConnector.java @@ -42,9 +42,11 @@ public class ImageRendererConnector extends ClickableRendererConnector<String> { @Override public String decode(JsonValue value) { - return ((URLReference) JsonDecoder.decodeValue( + URLReference reference = (URLReference) JsonDecoder.decodeValue( TypeDataStore.getType(URLReference.class), value, null, - getConnection())).getURL(); + getConnection()); + + return reference != null ? reference.getURL() : null; } @Override diff --git a/client/src/com/vaadin/client/renderers/ImageRenderer.java b/client/src/com/vaadin/client/renderers/ImageRenderer.java index b1e8ce5702..9e61e60919 100644 --- a/client/src/com/vaadin/client/renderers/ImageRenderer.java +++ b/client/src/com/vaadin/client/renderers/ImageRenderer.java @@ -29,6 +29,8 @@ import com.vaadin.client.widget.grid.RendererCellReference; */ public class ImageRenderer extends ClickableRenderer<String, Image> { + public static final String TRANSPARENT_GIF_1PX = "data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACwAAAAAAQABAAACAkQBADs="; + @Override public Image createWidget() { Image image = GWT.create(Image.class); @@ -38,6 +40,11 @@ public class ImageRenderer extends ClickableRenderer<String, Image> { @Override public void render(RendererCellReference cell, String url, Image image) { - image.setUrl(url); + if (url == null) { + image.setUrl(TRANSPARENT_GIF_1PX); + } + else { + image.setUrl(url); + } } } |