fix(messages): Timestamp display issue after merge

This commit is contained in:
Ben Gotow 2015-02-24 16:24:01 -08:00
parent 2a93c70214
commit 71e216ddff
2 changed files with 3 additions and 2 deletions

View file

@ -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>

View file

@ -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())