diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-08-18 11:55:57 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-08-18 11:55:57 -0400 |
commit | 78c4bff0c179a952920d167378234bff847682fc (patch) | |
tree | f6f6747873d9aef1e955de764339ca0bfd9f0eeb | |
parent | 72b743efa5e071db4fba818ef09549183c7fc05e (diff) | |
parent | 7ce0bf8f6cc0c77962311f26b3d496a5b502ba2c (diff) | |
download | chat-78c4bff0c179a952920d167378234bff847682fc.tar.gz chat-78c4bff0c179a952920d167378234bff847682fc.tar.bz2 chat-78c4bff0c179a952920d167378234bff847682fc.zip |
Merge pull request #375 from nickago/MM-1777
MM-1777 Formatted comments' time in RHS similar to root
-rw-r--r-- | web/react/components/post_right.jsx | 4 | ||||
-rw-r--r-- | web/react/utils/utils.jsx | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx index 175e1080d..c8c51b0c3 100644 --- a/web/react/components/post_right.jsx +++ b/web/react/components/post_right.jsx @@ -120,7 +120,7 @@ RootPost = React.createClass({ <div className='post__content'> <ul className='post-header'> <li className='post-header-col'><strong><UserProfile userId={post.user_id} /></strong></li> - <li className='post-header-col'><time className='post-right-root-time'>{utils.displayDate(post.create_at) + ' ' + utils.displayTime(post.create_at)}</time></li> + <li className='post-header-col'><time className='post-right-root-time'>{utils.displayCommentDateTime(post.create_at)}</time></li> <li className='post-header-col post-header__reply'> <div className='dropdown'> {ownerOptions} @@ -229,7 +229,7 @@ CommentPost = React.createClass({ <div className='post__content'> <ul className='post-header'> <li className='post-header-col'><strong><UserProfile userId={post.user_id} /></strong></li> - <li className='post-header-col'><time className='post-right-comment-time'>{utils.displayDateTime(post.create_at)}</time></li> + <li className='post-header-col'><time className='post-right-comment-time'>{utils.displayCommentDateTime(post.create_at)}</time></li> <li className='post-header-col post-header__reply'> {ownerOptions} </li> diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index 32793809d..3f7d204e4 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -192,6 +192,10 @@ module.exports.displayDateTime = function(ticks) { } +module.exports.displayCommentDateTime = function(ticks) { + return module.exports.displayDate(ticks) + ' ' + module.exports.displayTime(ticks); +} + // returns Unix timestamp in milliseconds module.exports.getTimestamp = function() { return Date.now(); |