From 6d5236bf6440157ad4d489acd1420554b77be577 Mon Sep 17 00:00:00 2001
From: Tyler Schicke <tyler_schicke@brown.edu>
Date: Mon, 18 Mar 2019 03:39:51 -0400
Subject: URL fixes and cleanup: Switched URL fields to serialize a string
 version of their URL, as mobile browsers won't serialize URLs apparently

---
 src/fields/AudioField.ts |  8 ++++----
 src/fields/HtmlField.ts  |  2 +-
 src/fields/ImageField.ts |  4 ++--
 src/fields/KVPField      |  0
 src/fields/KVPField.ts   | 30 ------------------------------
 src/fields/PDFField.ts   |  4 ++--
 src/fields/VideoField.ts |  4 ++--
 src/fields/WebField.ts   |  4 ++--
 8 files changed, 13 insertions(+), 43 deletions(-)
 delete mode 100644 src/fields/KVPField
 delete mode 100644 src/fields/KVPField.ts

(limited to 'src')

diff --git a/src/fields/AudioField.ts b/src/fields/AudioField.ts
index aefcc15c1..8864471ae 100644
--- a/src/fields/AudioField.ts
+++ b/src/fields/AudioField.ts
@@ -10,8 +10,8 @@ export class AudioField extends BasicField<URL> {
     toString(): string {
         return this.Data.href;
     }
-    
-    
+
+
     ToScriptString(): string {
         return `new AudioField("${this.Data}")`;
     }
@@ -20,10 +20,10 @@ export class AudioField extends BasicField<URL> {
         return new AudioField(this.Data);
     }
 
-    ToJson(): { type: Types, data: URL, _id: string } {
+    ToJson(): { type: Types, data: string, _id: string } {
         return {
             type: Types.Audio,
-            data: this.Data,
+            data: this.Data.href,
             _id: this.Id
         }
     }
diff --git a/src/fields/HtmlField.ts b/src/fields/HtmlField.ts
index a07326095..7cbdf7e58 100644
--- a/src/fields/HtmlField.ts
+++ b/src/fields/HtmlField.ts
@@ -15,7 +15,7 @@ export class HtmlField extends BasicField<string> {
         return new HtmlField(this.Data);
     }
 
-    ToJson(): { _id: string; type: Types; data: any; } {
+    ToJson(): { _id: string; type: Types; data: string; } {
         return {
             type: Types.Html,
             data: this.Data,
diff --git a/src/fields/ImageField.ts b/src/fields/ImageField.ts
index be8d73e68..a9ece7d7b 100644
--- a/src/fields/ImageField.ts
+++ b/src/fields/ImageField.ts
@@ -19,10 +19,10 @@ export class ImageField extends BasicField<URL> {
         return new ImageField(this.Data);
     }
 
-    ToJson(): { type: Types, data: URL, _id: string } {
+    ToJson(): { type: Types, data: string, _id: string } {
         return {
             type: Types.Image,
-            data: this.Data,
+            data: this.Data.href,
             _id: this.Id
         }
     }
diff --git a/src/fields/KVPField b/src/fields/KVPField
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/fields/KVPField.ts b/src/fields/KVPField.ts
deleted file mode 100644
index a7ecc0768..000000000
--- a/src/fields/KVPField.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { BasicField } from "./BasicField"
-import { FieldId } from "./Field";
-import { Types } from "../server/Message";
-import { Document } from "./Document"
-
-export class KVPField extends BasicField<Document> {
-    constructor(data: Document | undefined = undefined, id?: FieldId, save: boolean = true) {
-        super(data == undefined ? new Document() : data, save, id);
-    }
-
-    toString(): string {
-        return this.Data.Title;
-    }
-
-    ToScriptString(): string {
-        return `new KVPField("${this.Data}")`;
-    }
-
-    Copy() {
-        return new KVPField(this.Data);
-    }
-
-    ToJson(): { type: Types, data: Document, _id: string } {
-        return {
-            type: Types.Text,
-            data: this.Data,
-            _id: this.Id
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/fields/PDFField.ts b/src/fields/PDFField.ts
index f3a009001..b6625387e 100644
--- a/src/fields/PDFField.ts
+++ b/src/fields/PDFField.ts
@@ -22,10 +22,10 @@ export class PDFField extends BasicField<URL> {
         return `new PDFField("${this.Data}")`;
     }
 
-    ToJson(): { type: Types, data: URL, _id: string } {
+    ToJson(): { type: Types, data: string, _id: string } {
         return {
             type: Types.PDF,
-            data: this.Data,
+            data: this.Data.href,
             _id: this.Id
         }
     }
diff --git a/src/fields/VideoField.ts b/src/fields/VideoField.ts
index 5f4ae19bf..626e4ec83 100644
--- a/src/fields/VideoField.ts
+++ b/src/fields/VideoField.ts
@@ -19,10 +19,10 @@ export class VideoField extends BasicField<URL> {
         return new VideoField(this.Data);
     }
 
-    ToJson(): { type: Types, data: URL, _id: string } {
+    ToJson(): { type: Types, data: string, _id: string } {
         return {
             type: Types.Video,
-            data: this.Data,
+            data: this.Data.href,
             _id: this.Id
         }
     }
diff --git a/src/fields/WebField.ts b/src/fields/WebField.ts
index 8f945d686..6c4de5000 100644
--- a/src/fields/WebField.ts
+++ b/src/fields/WebField.ts
@@ -19,10 +19,10 @@ export class WebField extends BasicField<URL> {
         return new WebField(this.Data);
     }
 
-    ToJson(): { type: Types, data: URL, _id: string } {
+    ToJson(): { type: Types, data: string, _id: string } {
         return {
             type: Types.Web,
-            data: this.Data,
+            data: this.Data.href,
             _id: this.Id
         }
     }
-- 
cgit v1.2.3-70-g09d2