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

1 files changed, 20 insertions, 5 deletions

diff --git a/src/fields/PDFField.ts b/src/fields/PDFField.ts
index 2d8b0f635..0db47a884 100644
--- a/src/fields/PDFField.ts
+++ b/src/fields/PDFField.ts
@@ -1,10 +1,13 @@
 import { BasicField } from "./BasicField";
 import { Field } from "./Field";
-import {observable} from "mobx"
+import { observable } from "mobx"
+import { Types } from "../server/Message";
+
+
 
 export class PDFField extends BasicField<URL> {
-    constructor(data: URL | undefined = undefined) {
-        super(data == undefined ? new URL("http://cs.brown.edu/~bcz/face.gif") : data);
+    constructor(data: URL | undefined = undefined, save: boolean = true) {
+        super(data || new URL("http://cs.brown.edu/~bcz/face.gif"), save);
     }
 
     toString(): string {
@@ -14,8 +17,20 @@ export class PDFField extends BasicField<URL> {
     Copy(): Field {
         return new PDFField(this.Data);
     }
-    
+
+    ToScriptString(): string {
+        return `new PDFField("${this.Data}")`;
+    }
+
+    ToJson(): { type: Types, data: URL, _id: string } {
+        return {
+            type: Types.PDF,
+            data: this.Data,
+            _id: this.Id
+        }
+    }
+
     @observable
-    Page:Number = 1; 
+    Page: Number = 1;
 
 }
\ No newline at end of file