mirror of
https://github.com/Foundry376/Mailspring.git
synced 2024-11-11 01:54:40 +08:00
fix(messages): Timestamp display issue after merge
This commit is contained in:
parent
2a93c70214
commit
71e216ddff
2 changed files with 3 additions and 2 deletions
|
@ -44,7 +44,7 @@ MessageItem = React.createClass
|
|||
|
||||
header =
|
||||
<header className="message-header" onClick={@_onToggleCollapsed}>
|
||||
<MessageTimestamp date={@props.message.date} />
|
||||
<MessageTimestamp className="message-time" date={@props.message.date} />
|
||||
<div className="message-actions">
|
||||
{<Action thread={@props.thread} message={@props.message} /> for Action in messageActions}
|
||||
</div>
|
||||
|
|
|
@ -6,9 +6,10 @@ MessageTimestamp = React.createClass
|
|||
displayName: 'MessageTimestamp'
|
||||
propTypes:
|
||||
date: React.PropTypes.object.isRequired,
|
||||
className: React.PropTypes.string,
|
||||
|
||||
render: ->
|
||||
<div>{moment(@props.date).format(@_timeFormat())}</div>
|
||||
<div className={@props.className}>{moment(@props.date).format(@_timeFormat())}</div>
|
||||
|
||||
_timeFormat: ->
|
||||
today = moment(@_today())
|
||||
|
|
Loading…
Reference in a new issue