summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2014-07-04 10:36:39 +0300
committerVaadin Code Review <review@vaadin.com>2014-07-15 11:11:06 +0000
commitc24aa13505837b5893ef3842c4c9154127f4e858 (patch)
tree990b17a8a17ab2120de53ec5300e946a22289679
parentdf13b061f2f6ba10beae64d9b358c0365736370e (diff)
downloadvaadin-framework-c24aa13505837b5893ef3842c4c9154127f4e858.tar.gz
vaadin-framework-c24aa13505837b5893ef3842c4c9154127f4e858.zip
Mention Date serialization in javadocs related to JavaScript (#14143)
Change-Id: I14d782843684f623a2cf671f14d0ab062829ebac
-rw-r--r--server/src/com/vaadin/server/AbstractJavaScriptExtension.java2
-rw-r--r--server/src/com/vaadin/ui/AbstractJavaScriptComponent.java2
2 files changed, 4 insertions, 0 deletions
diff --git a/server/src/com/vaadin/server/AbstractJavaScriptExtension.java b/server/src/com/vaadin/server/AbstractJavaScriptExtension.java
index acf6a870c6..410eea3c01 100644
--- a/server/src/com/vaadin/server/AbstractJavaScriptExtension.java
+++ b/server/src/com/vaadin/server/AbstractJavaScriptExtension.java
@@ -103,6 +103,8 @@ import com.vaadin.ui.JavaScriptFunction;
* <li>The primitive Java boolean and the boxed Boolean are represented by
* JavaScript booleans.</li>
* <li>Java Strings are represented by JavaScript strings.</li>
+ * <li>Java Dates are represented by JavaScript numbers containing the timestamp
+ * </li>
* <li>List, Set and all arrays in Java are represented by JavaScript arrays.</li>
* <li>Map<String, ?> in Java is represented by JavaScript object with fields
* corresponding to the map keys.</li>
diff --git a/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java b/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java
index d6e232035b..f3cbf47b62 100644
--- a/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java
+++ b/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java
@@ -116,6 +116,8 @@ import com.vaadin.shared.ui.JavaScriptComponentState;
* <li>The primitive Java boolean and the boxed Boolean are represented by
* JavaScript booleans.</li>
* <li>Java Strings are represented by JavaScript strings.</li>
+ * <li>Java Dates are represented by JavaScript numbers containing the timestamp
+ * </li>
* <li>List, Set and all arrays in Java are represented by JavaScript arrays.</li>
* <li>Map<String, ?> in Java is represented by JavaScript object with fields
* corresponding to the map keys.</li>