Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into webcam_mohammad

1 files changed, 6 insertions, 2 deletions

diff --git a/src/new_fields/InkField.ts b/src/new_fields/InkField.ts
index e2aa7ee16..4a44b4f55 100644
--- a/src/new_fields/InkField.ts
+++ b/src/new_fields/InkField.ts
@@ -1,14 +1,15 @@
 import { Deserializable } from "../client/util/SerializationHelper";
 import { serializable, custom, createSimpleSchema, list, object, map } from "serializr";
 import { ObjectField } from "./ObjectField";
-import { Copy, ToScriptString } from "./FieldSymbols";
+import { Copy, ToScriptString, ToString } from "./FieldSymbols";
 
 export enum InkTool {
     None,
     Pen,
     Highlighter,
     Eraser,
-    Scrubber
+    Scrubber,
+    Stamp
 }
 
 export interface PointData {
@@ -44,4 +45,7 @@ export class InkField extends ObjectField {
     [ToScriptString]() {
         return "invalid";
     }
+    [ToString]() {
+        return "InkField";
+    }
 }