Merge branch 'master' into audiovideo

1 files changed, 10 insertions, 0 deletions

diff --git a/src/server/ServerUtil.ts b/src/server/ServerUtil.ts
index 2e681fece..5331c9e30 100644
--- a/src/server/ServerUtil.ts
+++ b/src/server/ServerUtil.ts
@@ -1,3 +1,4 @@
+
 import { Field } from './../fields/Field';
 import { TextField } from './../fields/TextField';
 import { NumberField } from './../fields/NumberField';
@@ -13,6 +14,11 @@ import { HtmlField } from '../fields/HtmlField';
 import { WebField } from '../fields/WebField';
 import { AudioField } from '../fields/AudioField';
 import { VideoField } from '../fields/VideoField';
+import {InkField} from '../fields/InkField';
+import {PDFField} from '../fields/PDFField';
+
+
+
 
 export class ServerUtils {
     public static FromJson(json: any): Field {
@@ -41,12 +47,16 @@ export class ServerUtils {
                 return new Key(data, id, false)
             case Types.Image:
                 return new ImageField(new URL(data), id, false)
+            case Types.PDF:
+                return new PDFField(new URL(data), id, false)
             case Types.List:
                 return ListField.FromJson(id, data)
             case Types.Audio:
                 return new AudioField(new URL(data), id, false)
             case Types.Video:
                 return new VideoField(new URL(data), id, false)
+            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][]