imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show the full date and time if the receipt was sent days after the event

Browse source
This commit is contained in:
Kegan Dougal 2016-12-09 11:43:23 +00:00
parent 49010c3e93
commit 5d99d68a64
2 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/components/views/rooms/ReadReceiptMarker.js
View file

@ -63,6 +63,9 @@ module.exports = React.createClass({
// Timestamp when the receipt was read
timestamp: React.PropTypes.number,
// True to show the full date/time rather than just the time
showFullTimestamp: React.PropTypes.bool,
},
getDefaultProps: function() {
@ -165,10 +168,18 @@ module.exports = React.createClass({
visibility: this.props.hidden ? 'hidden' : 'visible',
};
var title;
let title;
if (this.props.timestamp) {
// "7:05:45 PM (@alice:matrix.org)"
title = new Date(this.props.timestamp).toLocaleTimeString() + " (" + this.props.member.userId + ")";
let suffix = " (" + this.props.member.userId + ")";
let ts = new Date(this.props.timestamp);
if (this.props.showFullTimestamp) {
// "15/12/2016, 7:05:45 PM (@alice:matrix.org)"
title = ts.toLocaleString() + suffix;
}
else {
// "7:05:45 PM (@alice:matrix.org)"
title = ts.toLocaleTimeString() + suffix;
}
}
return (