Merge branch 'master' into info-ui-observable

1 files changed, 4 insertions, 1 deletions

diff --git a/src/fields/DateField.ts b/src/fields/DateField.ts
index 2ea619bd9..1e5222fb6 100644
--- a/src/fields/DateField.ts
+++ b/src/fields/DateField.ts
@@ -1,7 +1,7 @@
 import { Deserializable } from '../client/util/SerializationHelper';
 import { serializable, date } from 'serializr';
 import { ObjectField } from './ObjectField';
-import { Copy, ToScriptString, ToString } from './FieldSymbols';
+import { Copy, ToJavascriptString, ToScriptString, ToString } from './FieldSymbols';
 import { scriptingGlobal, ScriptingGlobals } from '../client/util/ScriptingGlobals';
 
 @scriptingGlobal
@@ -23,6 +23,9 @@ export class DateField extends ObjectField {
         return `${this.date.toLocaleString()}`;
     }
 
+    [ToJavascriptString]() {
+        return `"${this.date.toISOString()}"`;
+    }
     [ToScriptString]() {
         return `new DateField(new Date("${this.date.toISOString()}"))`;
     }