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

Show full date 

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
pull/21833/head
Šimon Brandner 2021-02-25 08:20:34 +01:00
parent 83de84972e
commit b18622efe4
No known key found for this signature in database
GPG Key ID: 9760693FDD98A790
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/views/elements/ImageView.js
View File

@ -30,7 +30,7 @@ import MessageContextMenu from "../context_menus/MessageContextMenu";
import {aboveLeftOf, ContextMenu} from '../../structures/ContextMenu'; import {aboveLeftOf, ContextMenu} from '../../structures/ContextMenu';
import MessageTimestamp from "../messages/MessageTimestamp"; import MessageTimestamp from "../messages/MessageTimestamp";
import SettingsStore from "../../../settings/SettingsStore"; import SettingsStore from "../../../settings/SettingsStore";
import {formatTime} from "../../../DateUtils"; import {formatFullDate} from "../../../DateUtils";
import dis from '../../../dispatcher/dispatcher'; import dis from '../../../dispatcher/dispatcher';
export default class ImageView extends React.Component { export default class ImageView extends React.Component {
@ -286,9 +286,9 @@ export default class ImageView extends React.Component {
<a <a
href={permalink} href={permalink}
onClick={this.onPermalinkClicked} onClick={this.onPermalinkClicked}
aria-label={formatTime(new Date(this.props.mxEvent.getTs()), this.props.isTwelveHour)} aria-label={formatFullDate(new Date(this.props.mxEvent.getTs()), this.props.isTwelveHour)}
> >
<MessageTimestamp showTwelveHour={showTwelveHour} ts={mxEvent.getTs()} /> <MessageTimestamp showFullDate={true} showTwelveHour={showTwelveHour} ts={mxEvent.getTs()} />
</a> </a>
); );

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

@ -23,13 +23,18 @@ export default class MessageTimestamp extends React.Component {
static propTypes = { static propTypes = {
ts: PropTypes.number.isRequired, ts: PropTypes.number.isRequired,
showTwelveHour: PropTypes.bool, showTwelveHour: PropTypes.bool,
showFullDate: PropTypes.bool,
}; };
render() { render() {
const date = new Date(this.props.ts); const date = new Date(this.props.ts);
return ( return (
<span className="mx_MessageTimestamp" title={formatFullDate(date, this.props.showTwelveHour)} aria-hidden={true}> <span className="mx_MessageTimestamp" title={formatFullDate(date, this.props.showTwelveHour)} aria-hidden={true}>
{ formatTime(date, this.props.showTwelveHour) } {
this.props.showFullDate ?
formatFullDate(date, this.props.showTwelveHour) :
formatTime(date, this.props.showTwelveHour)
}
</span> </span>
); );
} }