diff options
| author | Leif Åstrand <leif@vaadin.com> | 2015-01-15 11:41:20 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-01-15 11:26:03 +0000 |
| commit | 8d4661f867aab6a58c257ebe49d342a4a4af56d7 (patch) | |
| tree | 81eb51699125551abc3c969eb283bb15cd509bc8 /shared | |
| parent | 9839c54cb1d9cf6e774ff40f0bc0d1b2a64acd01 (diff) | |
| download | vaadin-framework-8d4661f867aab6a58c257ebe49d342a4a4af56d7.tar.gz vaadin-framework-8d4661f867aab6a58c257ebe49d342a4a4af56d7.zip | |
Make Grid send Json as Json (#16244)
Change-Id: I2da481dcd3c258e48f2f77a9d3c8c46bb81048ff
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/build.xml | 4 | ||||
| -rw-r--r-- | shared/src/com/vaadin/shared/data/DataProviderRpc.java | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/shared/build.xml b/shared/build.xml index 8e2f6bc15e..42e9952217 100644 --- a/shared/build.xml +++ b/shared/build.xml @@ -16,7 +16,9 @@ <property name="result.dir" location="result" /> <property name="src.filtered" location="${result.dir}/filtered-src" /> <property name="src" location="${src.filtered}" /> - <path id="classpath.compile.custom" /> + <path id="classpath.compile.custom"> + <fileset file="${gwt.elemental.jar}" /> + </path> <path id="classpath.test.custom" /> <target name="jar"> diff --git a/shared/src/com/vaadin/shared/data/DataProviderRpc.java b/shared/src/com/vaadin/shared/data/DataProviderRpc.java index 4bf4f3af5b..4bfdb8b6c5 100644 --- a/shared/src/com/vaadin/shared/data/DataProviderRpc.java +++ b/shared/src/com/vaadin/shared/data/DataProviderRpc.java @@ -19,6 +19,8 @@ package com.vaadin.shared.data; import com.vaadin.shared.annotations.NoLayout; import com.vaadin.shared.communication.ClientRpc; +import elemental.json.JsonArray; + /** * RPC interface used for pushing container data to the client. * @@ -53,7 +55,7 @@ public interface DataProviderRpc extends ClientRpc { * @see com.vaadin.ui.components.grid.Renderer#encode(Object) */ @NoLayout - public void setRowData(int firstRowIndex, String rowDataJson); + public void setRowData(int firstRowIndex, JsonArray rowDataJson); /** * Informs the client to remove row data. |