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

1 files changed, 16 insertions, 4 deletions

diff --git a/src/fields/ImageField.ts b/src/fields/ImageField.ts
index e6b29fd3f..be8d73e68 100644
--- a/src/fields/ImageField.ts
+++ b/src/fields/ImageField.ts
@@ -1,17 +1,29 @@
 import { BasicField } from "./BasicField";
-import { Field } from "./Field";
-import {observable} from "mobx"
+import { Field, FieldId } from "./Field";
+import { Types } from "../server/Message";
 
 export class ImageField 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, id?: FieldId, save: boolean = true) {
+        super(data == undefined ? new URL("http://cs.brown.edu/~bcz/bob_fettucine.jpg") : data, save, id);
     }
 
     toString(): string {
         return this.Data.href;
     }
 
+    ToScriptString(): string {
+        return `new ImageField("${this.Data}")`;
+    }
+
     Copy(): Field {
         return new ImageField(this.Data);
     }
+
+    ToJson(): { type: Types, data: URL, _id: string } {
+        return {
+            type: Types.Image,
+            data: this.Data,
+            _id: this.Id
+        }
+    }
 }
\ No newline at end of file