summaryrefslogtreecommitdiffstats
path: root/web/react/components/time_since.jsx
diff options
context:
space:
mode:
authorReed Garmsen <rgarmsen2295@gmail.com>2016-02-01 14:30:16 -0800
committerReed Garmsen <rgarmsen2295@gmail.com>2016-02-02 11:54:01 -0800
commit92816619cc584c7c172c4e4fdde17624cf7f913f (patch)
treea28fed455824c0011b4a6303598bb242e75035c2 /web/react/components/time_since.jsx
parentfe39f2400f616e14fbaec67b1d22e80d1583e1f1 (diff)
downloadchat-92816619cc584c7c172c4e4fdde17624cf7f913f.tar.gz
chat-92816619cc584c7c172c4e4fdde17624cf7f913f.tar.bz2
chat-92816619cc584c7c172c4e4fdde17624cf7f913f.zip
Changed clock icon in repeat posts to simple timestamp
Diffstat (limited to 'web/react/components/time_since.jsx')
-rw-r--r--web/react/components/time_since.jsx17
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
};