mirror of
https://github.com/SchildiChat/element-web.git
synced 2024-10-01 01:26:12 -04:00
Merge pull request #4092 from turt2live/travis/12hrtime-hotfix
Show 12hr time on hover too
This commit is contained in:
commit
4493994dd5
@ -16,7 +16,6 @@ limitations under the License.
|
||||
|
||||
'use strict';
|
||||
|
||||
import * as UserSettingsStore from 'matrix-react-sdk/lib/UserSettingsStore';
|
||||
const React = require('react');
|
||||
const DateUtils = require('matrix-react-sdk/lib/DateUtils');
|
||||
|
||||
@ -30,7 +29,7 @@ module.exports = React.createClass({
|
||||
render: function() {
|
||||
const date = new Date(this.props.ts);
|
||||
return (
|
||||
<span className="mx_MessageTimestamp" title={ DateUtils.formatFullDate(date) }>
|
||||
<span className="mx_MessageTimestamp" title={ DateUtils.formatFullDate(date, this.props.showTwelveHour) }>
|
||||
{ DateUtils.formatTime(date, this.props.showTwelveHour) }
|
||||
</span>
|
||||
);
|
||||
|
Loading…
Reference in New Issue
Block a user