Merge pull request #58 from VisionistInc/timestamps

Added different timestamp format based on age of timestamp
VisionistInc · Jul 30, 2015 · 972af55 · 972af55
2 parents e678eae + d12ebcf
commit 972af55
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/public/js/bundle/jibe.js b/public/js/bundle/jibe.js
@@ -504,7 +504,7 @@ var Jibe = (function (BCSocket, CodeMirror, Replay, showdown, Timestamps, TextFo
       client     : client,
       container  : '#timestamps-container',
       codemirror : editor,
-      format     : 'YYYY-MM-DD HH:mm'
+      format     : 'HH:mm'
     });
   }
 
@@ -1534,6 +1534,19 @@ function Timestamps (data) {
    *  Returns a timestamp string based on the format.
    */
   this.getMoment = function (timestamp) {
+    var now = Date.now();
+
+    if(moment(now).year() !== moment(timestamp).year()){
+        this.format = "YYYY/MM/DD";
+    }
+    else if(moment(now).date() !== moment(timestamp).date()){
+      this.format = "MM/DD HH:mm";
+    }
+    else{
+      this.format = "HH:mm";
+    }
+
+
     return moment (timestamp).format (this.format);
   };
 

diff --git a/public/js/jibe.js b/public/js/jibe.js
@@ -98,7 +98,7 @@ var Jibe = (function (BCSocket, CodeMirror, Replay, showdown, Timestamps, TextFo
       client     : client,
       container  : '#timestamps-container',
       codemirror : editor,
-      format     : 'YYYY-MM-DD HH:mm'
+      format     : 'HH:mm'
     });
   }
 

diff --git a/public/js/timestamps.js b/public/js/timestamps.js
@@ -38,6 +38,19 @@ function Timestamps (data) {
    *  Returns a timestamp string based on the format.
    */
   this.getMoment = function (timestamp) {
+    var now = Date.now();
+
+    if(moment(now).year() !== moment(timestamp).year()){
+        this.format = "YYYY/MM/DD";
+    }
+    else if(moment(now).date() !== moment(timestamp).date()){
+      this.format = "MM/DD HH:mm";
+    }
+    else{
+      this.format = "HH:mm";
+    }
+
+
     return moment (timestamp).format (this.format);
   };