Merge pull request #375 from nickago/MM-1777
MM-1777 Formatted comments' time in RHS similar to root
Этот коммит содержится в:
@@ -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>
|
||||
|
||||
@@ -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();
|
||||
|
||||
Ссылка в новой задаче
Block a user