aboutsummaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authortschicke-brown <tyler_schicke@brown.edu>2019-03-08 04:58:58 +0000
committerGitHub <noreply@github.com>2019-03-08 04:58:58 +0000
commit5a1da11a5767899aac2f1bfac6d33e0ee5d47c9e (patch)
tree303cc06880b6c5e0cc644f559c9548f95790423e /src/server
parent9940924f361f1b9d65d7cc0ad1e4f6f1f4d5d318 (diff)
parent889407852167dece0160127817e390336697e3a6 (diff)
Merge pull request #45 from browngraphicslab/inking
Inking
Diffstat (limited to 'src/server')
-rw-r--r--src/server/Message.ts2
-rw-r--r--src/server/ServerUtil.ts3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/server/Message.ts b/src/server/Message.ts
index 148e6e723..fc07ef89b 100644
--- a/src/server/Message.ts
+++ b/src/server/Message.ts
@@ -45,7 +45,7 @@ export class GetFieldArgs {
}
export enum Types {
- Number, List, Key, Image, Web, Document, Text, RichText, DocumentReference, Html
+ Number, List, Key, Image, Web, Document, Text, RichText, DocumentReference, Html, Ink
}
export class DocumentTransfer implements Transferable {
diff --git a/src/server/ServerUtil.ts b/src/server/ServerUtil.ts
index a53fb5d2b..f5734a86c 100644
--- a/src/server/ServerUtil.ts
+++ b/src/server/ServerUtil.ts
@@ -11,6 +11,7 @@ import { Types } from './Message';
import { Utils } from '../Utils';
import { HtmlField } from '../fields/HtmlField';
import { WebField } from '../fields/WebField';
+import { InkField } from '../fields/InkField';
export class ServerUtils {
public static FromJson(json: any): Field {
@@ -41,6 +42,8 @@ export class ServerUtils {
return new ImageField(new URL(data), id, false)
case Types.List:
return ListField.FromJson(id, data)
+ case Types.Ink:
+ return InkField.FromJson(id, data);
case Types.Document:
let doc: Document = new Document(id, false)
let fields: [string, string][] = data as [string, string][]