OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3193 from matrix-org/bwindels/replace-server-date 

Take server-side aggregation into account for timestamp on (edited) tooltip
pull/21833/head
Bruno Windels 2019-07-09 15:03:21 +00:00 committed by GitHub
parent 349afb13f3 58d7ed02b7
commit 7ab665bf31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/views/messages/TextualBody.js
View File

@ -364,11 +364,11 @@ module.exports = React.createClass({
let editedTooltip; let editedTooltip;
if (this.state.editedMarkerHovered) { if (this.state.editedMarkerHovered) {
const Tooltip = sdk.getComponent('elements.Tooltip'); const Tooltip = sdk.getComponent('elements.Tooltip');
const editEvent = this.props.mxEvent.replacingEvent(); const date = this.props.mxEvent.replacingEventDate();
const date = editEvent && formatDate(editEvent.getDate()); const dateString = date && formatDate(date);
editedTooltip = <Tooltip editedTooltip = <Tooltip
tooltipClassName="mx_Tooltip_timeline" tooltipClassName="mx_Tooltip_timeline"
label={_t("Edited at %(date)s. Click to view edits.", {date})} label={_t("Edited at %(date)s. Click to view edits.", {date: dateString})}
/>; />;
} }
return ( return (