diff options
| author | Monika Hedman <monika_hedman@brown.edu> | 2019-04-29 19:55:28 -0400 |
|---|---|---|
| committer | Monika Hedman <monika_hedman@brown.edu> | 2019-04-29 19:55:28 -0400 |
| commit | 53e183fbc116c406ca86889a9fb3e2de61520b60 (patch) | |
| tree | ab979ebabffad7f63f23666aa80025d9bad90872 /src/server | |
| parent | 39bb878a32821d2e14110f4158471890234f4769 (diff) | |
| parent | 3da71792a339536118b7af7cfe0529201a45c64e (diff) | |
merge
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/Message.ts | 4 | ||||
| -rw-r--r-- | src/server/ServerUtil.ts | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/server/Message.ts b/src/server/Message.ts index bbe4ffcad..854ae0168 100644 --- a/src/server/Message.ts +++ b/src/server/Message.ts @@ -14,8 +14,8 @@ export class Message<T> { } export enum Types { - Number, List, Key, Image, Web, Document, Text, RichText, DocumentReference, - Html, Video, Audio, Ink, PDF, Tuple, HistogramOp, Boolean, Script, + Number, List, Key, Image, Web, Document, Text, Icon, RichText, DocumentReference, + Html, Video, Audio, Ink, PDF, Tuple, HistogramOp, Boolean, Script, Templates } export interface Transferable { diff --git a/src/server/ServerUtil.ts b/src/server/ServerUtil.ts index 818230c1a..eb5749dff 100644 --- a/src/server/ServerUtil.ts +++ b/src/server/ServerUtil.ts @@ -18,6 +18,8 @@ import { NumberField } from "./../fields/NumberField"; import { RichTextField } from "./../fields/RichTextField"; import { TextField } from "./../fields/TextField"; import { Transferable, Types } from "./Message"; +import { TemplateField } from "../fields/TemplateField"; +import { IconField } from "../fields/IconFIeld"; export class ServerUtils { public static prepend(extension: string): string { @@ -37,6 +39,7 @@ export class ServerUtils { case Types.Boolean: return new BooleanField(json.data, json.id, false); case Types.Number: return new NumberField(json.data, json.id, false); case Types.Text: return new TextField(json.data, json.id, false); + case Types.Icon: return new IconField(json.data, json.id, false); case Types.Html: return new HtmlField(json.data, json.id, false); case Types.Web: return new WebField(new URL(json.data), json.id, false); case Types.RichText: return new RichTextField(json.data, json.id, false); @@ -50,6 +53,7 @@ export class ServerUtils { case Types.Video: return new VideoField(new URL(json.data), json.id, false); case Types.Tuple: return new TupleField(json.data, json.id, false); case Types.Ink: return InkField.FromJson(json.id, json.data); + case Types.Templates: return TemplateField.FromJson(json.id, json.data); case Types.Document: return Document.FromJson(json.data, json.id, false); default: throw Error( |