gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4092 from turt2live/travis/12hrtime-hotfix 

Show 12hr time on hover too
This commit is contained in:
Matthew Hodgson 2017-05-30 20:15:01 +01:00 committed by GitHub
parent e79df6a947 676bd6196f
commit 4493994dd5
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/views/messages/MessageTimestamp.js
View File

@ -16,7 +16,6 @@ limitations under the License.
'use strict'; 'use strict';
import * as UserSettingsStore from 'matrix-react-sdk/lib/UserSettingsStore';
const React = require('react'); const React = require('react');
const DateUtils = require('matrix-react-sdk/lib/DateUtils'); const DateUtils = require('matrix-react-sdk/lib/DateUtils');
@ -30,7 +29,7 @@ module.exports = React.createClass({
render: function() { render: function() {
const date = new Date(this.props.ts); const date = new Date(this.props.ts);
return ( 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) } { DateUtils.formatTime(date, this.props.showTwelveHour) }
</span> </span>
); );