Merge pull request #8 from browngraphicslab/server_database_merge

Server database merge

1 files changed, 12 insertions, 2 deletions

diff --git a/src/fields/TextField.ts b/src/fields/TextField.ts
index 11d2ed7cd..ad96ab6d9 100644
--- a/src/fields/TextField.ts
+++ b/src/fields/TextField.ts
@@ -1,8 +1,10 @@
 import { BasicField } from "./BasicField"
+import { FieldId } from "./Field";
+import { Types } from "../server/Message";
 
 export class TextField extends BasicField<string> {
-    constructor(data: string = "") {
-        super(data);
+    constructor(data: string = "", id?: FieldId, save: boolean = true) {
+        super(data, save, id);
     }
 
     ToScriptString(): string {
@@ -12,4 +14,12 @@ export class TextField extends BasicField<string> {
     Copy() {
         return new TextField(this.Data);
     }
+
+    ToJson(): { type: Types, data: string, _id: string } {
+        return {
+            type: Types.Text,
+            data: this.Data,
+            _id: this.Id
+        }
+    }
 }