From 889bd4bfc51eb74b4e6d91e1978a72e12102a6a7 Mon Sep 17 00:00:00 2001
From: Josh Janusch <josh.janusch@vuria.com>
Date: Fri, 1 Jan 2016 17:27:49 -0500
Subject: [PATCH 1/2] formatDate helper now will only use moment if date is
 valid. If it's not, will use the user inputted value or a fallback parameter,
 if it is provided

---
 src/eng/generic-helpers.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/eng/generic-helpers.js b/src/eng/generic-helpers.js
index 3f6d92a..86a75e9 100644
--- a/src/eng/generic-helpers.js
+++ b/src/eng/generic-helpers.js
@@ -21,10 +21,20 @@ Generic template helper definitions for HackMyResume / FluentCV.
 
     /**
     Convert the input date to a specified format through Moment.js.
+    If date is invalid, will return the time provided by the user, 
+    or default to the fallback param or 'Present' if that is set to true
     @method formatDate
     */
-    formatDate: function(datetime, format) {
-      return moment ? moment( datetime ).format( format ) : datetime;
+    formatDate: function(datetime, format, fallback) {
+      if (moment) {
+        var momentDate = moment( datetime );
+
+        if (momentDate.isValid()) {
+          return moment.format(format);
+        }
+      }
+
+      return datetime || (typeof fallback == 'string' ? fallback : (fallback === true ? 'Present' : null));
     },
 
     /**

From dd2148bb9254375ce91d27c40bd4cea3ef1454c6 Mon Sep 17 00:00:00 2001
From: Josh Janusch <josh.janusch@vuria.com>
Date: Fri, 1 Jan 2016 18:05:33 -0500
Subject: [PATCH 2/2] Fix: formatDate helper references the moment method, not
 the momentDate object

---
 src/eng/generic-helpers.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/eng/generic-helpers.js b/src/eng/generic-helpers.js
index 86a75e9..fffb094 100644
--- a/src/eng/generic-helpers.js
+++ b/src/eng/generic-helpers.js
@@ -28,10 +28,7 @@ Generic template helper definitions for HackMyResume / FluentCV.
     formatDate: function(datetime, format, fallback) {
       if (moment) {
         var momentDate = moment( datetime );
-
-        if (momentDate.isValid()) {
-          return moment.format(format);
-        }
+        if (momentDate.isValid()) return momentDate.format(format);
       }
 
       return datetime || (typeof fallback == 'string' ? fallback : (fallback === true ? 'Present' : null));