diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-02-03 07:36:04 -0500 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-02-03 07:36:04 -0500 |
commit | 5be7d002300afcf1e06cf9878d81f567b4bd9845 (patch) | |
tree | 6d5bad6d216762c05a6d1d246fdf77cd1fed7fe9 /web/react/components/time_since.jsx | |
parent | b7b61c0adc323c3a5129bb90f914551899a0e1f1 (diff) | |
parent | 92816619cc584c7c172c4e4fdde17624cf7f913f (diff) | |
download | chat-5be7d002300afcf1e06cf9878d81f567b4bd9845.tar.gz chat-5be7d002300afcf1e06cf9878d81f567b4bd9845.tar.bz2 chat-5be7d002300afcf1e06cf9878d81f567b4bd9845.zip |
Merge pull request #2048 from rgarmsen2295/plt-1317
PLT-1317 Replaces the clock icon for same user posts with a simple timestamp
Diffstat (limited to 'web/react/components/time_since.jsx')
-rw-r--r-- | web/react/components/time_since.jsx | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/web/react/components/time_since.jsx b/web/react/components/time_since.jsx index 32947bd60..0b549b1e6 100644 --- a/web/react/components/time_since.jsx +++ b/web/react/components/time_since.jsx @@ -14,7 +14,7 @@ export default class TimeSince extends React.Component { componentDidMount() { this.intervalId = setInterval(() => { this.forceUpdate(); - }, 30000); + }, Constants.TIME_SINCE_UPDATE_INTERVAL); } componentWillUnmount() { clearInterval(this.intervalId); @@ -23,6 +23,14 @@ export default class TimeSince extends React.Component { const displayDate = Utils.displayDate(this.props.eventTime); const displayTime = Utils.displayTime(this.props.eventTime); + if (this.props.sameUser) { + return ( + <time className='post__time'> + {Utils.displayTime(this.props.eventTime)} + </time> + ); + } + const tooltip = ( <Tooltip id={'time-since-tooltip-' + this.props.eventTime}> {displayDate + ' at ' + displayTime} @@ -42,10 +50,13 @@ export default class TimeSince extends React.Component { ); } } + TimeSince.defaultProps = { - eventTime: 0 + eventTime: 0, + sameUser: false }; TimeSince.propTypes = { - eventTime: React.PropTypes.number.isRequired + eventTime: React.PropTypes.number.isRequired, + sameUser: React.PropTypes.bool }; |