From d5ca1259b278b7c1579518f4ed0c07e525f899d9 Mon Sep 17 00:00:00 2001
From: Mark McDowall <markus.mcd5@gmail.com>
Date: Wed, 17 Jul 2013 19:37:39 -0700
Subject: [PATCH] Even better date formating

---
 UI/Shared/FormatHelpers.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/UI/Shared/FormatHelpers.js b/UI/Shared/FormatHelpers.js
index 179446246..1478afbce 100644
--- a/UI/Shared/FormatHelpers.js
+++ b/UI/Shared/FormatHelpers.js
@@ -20,17 +20,20 @@ define(
 
                 var date = Moment(sourceDate);
 
-                if (date.isAfter(Moment().add('days', 6))) {
+                var calendarDate = date.calendar();
+
+                //TODO: It would be nice to not have to hack this...
+                var strippedCalendarDate = calendarDate.substring(0, calendarDate.indexOf(' at '));
+
+                if (strippedCalendarDate){
+                    return strippedCalendarDate;
+                }
+
+                if (date.isAfter(Moment())) {
                     return date.fromNow(true);
                 }
 
-                if (date.isBefore(Moment().add('days', -6))) {
-                    return date.fromNow();
-                }
-
-                var calendarDate = date.calendar();
-                //TODO: It would be nice to not have to hack this...
-                return calendarDate.substring(0, calendarDate.indexOf(' at '));
+                return date.fromNow();
             },
 
             pad: function(n, width, z) {