diff options
author | Asaad Mahmood <asaadmahmoodspin@users.noreply.github.com> | 2016-06-03 00:34:47 +0500 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-06-02 12:34:47 -0700 |
commit | 848a8663ed7f856aee3f801a62b82e87b20de0ea (patch) | |
tree | d3721ea0c8635a412e947485528e6b02f75449d3 /webapp/components/time_since.jsx | |
parent | e0fca16b27b35d6d4303e5a76f10a689fdefcce3 (diff) | |
download | chat-848a8663ed7f856aee3f801a62b82e87b20de0ea.tar.gz chat-848a8663ed7f856aee3f801a62b82e87b20de0ea.tar.bz2 chat-848a8663ed7f856aee3f801a62b82e87b20de0ea.zip |
Multiple UI improvements (#3220)
* Multiple UI improvements
* Pushing time fix
* Fixing absolute time stamps on IOS
Diffstat (limited to 'webapp/components/time_since.jsx')
-rw-r--r-- | webapp/components/time_since.jsx | 38 |
1 files changed, 3 insertions, 35 deletions
diff --git a/webapp/components/time_since.jsx b/webapp/components/time_since.jsx index 50a0f7d04..2fbf73e31 100644 --- a/webapp/components/time_since.jsx +++ b/webapp/components/time_since.jsx @@ -4,10 +4,6 @@ import Constants from 'utils/constants.jsx'; import * as Utils from 'utils/utils.jsx'; -import {FormattedRelative, FormattedDate} from 'react-intl'; - -import {Tooltip, OverlayTrigger} from 'react-bootstrap'; - import React from 'react'; import PureRenderMixin from 'react-addons-pure-render-mixin'; @@ -26,38 +22,10 @@ export default class TimeSince extends React.Component { clearInterval(this.intervalId); } render() { - if (this.props.sameUser || this.props.compactDisplay) { - return ( - <time className='post__time'> - {Utils.displayTimeFormatted(this.props.eventTime)} - </time> - ); - } - - const tooltip = ( - <Tooltip id={'time-since-tooltip-' + this.props.eventTime}> - <FormattedDate - value={this.props.eventTime} - month='long' - day='numeric' - year='numeric' - hour12={!Utils.isMilitaryTime()} - hour='numeric' - minute='2-digit' - /> - </Tooltip> - ); - return ( - <OverlayTrigger - delayShow={Constants.OVERLAY_TIME_DELAY} - placement='top' - overlay={tooltip} - > - <time className='post__time'> - <FormattedRelative value={this.props.eventTime}/> - </time> - </OverlayTrigger> + <time className='post__time'> + {Utils.displayTimeFormatted(this.props.eventTime)} + </time> ); } } |