From 40259b883919e3bf1924ce7e2a6256628b72a64e Mon Sep 17 00:00:00 2001
From: Gisle Aune <dev@gisle.me>
Date: Sun, 17 Mar 2019 20:29:26 +0100
Subject: [PATCH] Fixed validation of fictionalDate input in add/edit story.

---
 .../components/edit-chapter-modal/component.js            | 2 ++
 .../components/edit-story-modal/component.js              | 8 ++++++--
 marko/page/story/components/add-story-modal/component.js  | 8 ++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/marko/page/story-content/components/edit-chapter-modal/component.js b/marko/page/story-content/components/edit-chapter-modal/component.js
index 605f2c0..f4e4a8b 100644
--- a/marko/page/story-content/components/edit-chapter-modal/component.js
+++ b/marko/page/story-content/components/edit-chapter-modal/component.js
@@ -25,6 +25,8 @@ module.exports = class {
 
       if (fictionalDate != null) {
         fictionalDate = moment.utc(fictionalDate).format("MMM D, YYYY")
+      } else {
+        fictionalDate = ""
       }
   
       this.state.values = {fictionalDate, title, source, commentMode, commentsLocked}
diff --git a/marko/page/story-content/components/edit-story-modal/component.js b/marko/page/story-content/components/edit-story-modal/component.js
index 84136d1..5afce46 100644
--- a/marko/page/story-content/components/edit-story-modal/component.js
+++ b/marko/page/story-content/components/edit-story-modal/component.js
@@ -46,8 +46,12 @@ module.exports = class {
     
     let fictionalDate = new Date(values.fictionalDate + " UTC")
     if (values.fictionalDate != "") {
-      if (Number.isNaN(fictionalDate)) {
-        this.state.error = `Could not parse ${values.fictionalDate} as date`
+      if (Number.isNaN(fictionalDate.getTime())) {
+        this.state.error = `Could not parse ${values.fictionalDate} as date.`
+        if (values.fictionalDate.includes("th")) {
+          this.state.error += " Try to remove the 'th'."
+        }
+
         return
       }
     } else {
diff --git a/marko/page/story/components/add-story-modal/component.js b/marko/page/story/components/add-story-modal/component.js
index 9d82404..edc8807 100644
--- a/marko/page/story/components/add-story-modal/component.js
+++ b/marko/page/story/components/add-story-modal/component.js
@@ -42,8 +42,12 @@ module.exports = class {
     
     let fictionalDate = new Date(values.fictionalDate + " UTC")
     if (values.fictionalDate != "") {
-      if (Number.isNaN(fictionalDate)) {
-        this.state.error = `Could not parse ${values.fictionalDate} as date`
+      if (Number.isNaN(fictionalDate.getTime())) {
+        this.state.error = `Could not parse ${values.fictionalDate} as date.`
+        if (values.fictionalDate.includes("th")) {
+          this.state.error += " Try to remove the 'th'."
+        }
+
         return
       }
     } else {