From fad728069a66e64f77d76ccc6ec3559f08fa3302 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Wed, 19 Aug 2020 10:27:27 +0200 Subject: [PATCH] don't show date & time on pending events --- src/domain/session/room/timeline/tiles/MessageTile.js | 6 +++--- src/ui/web/session/room/timeline/TextMessageView.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/domain/session/room/timeline/tiles/MessageTile.js b/src/domain/session/room/timeline/tiles/MessageTile.js index 74ba202c..f7c47030 100644 --- a/src/domain/session/room/timeline/tiles/MessageTile.js +++ b/src/domain/session/room/timeline/tiles/MessageTile.js @@ -21,7 +21,7 @@ export class MessageTile extends SimpleTile { constructor(options) { super(options); this._isOwn = this._entry.sender === options.ownUserId; - this._date = new Date(this._entry.timestamp); + this._date = this._entry.timestamp ? new Date(this._entry.timestamp) : null; this._isContinuation = false; } @@ -38,11 +38,11 @@ export class MessageTile extends SimpleTile { } get date() { - return this._date.toLocaleDateString({}, {month: "numeric", day: "numeric"}); + return this._date && this._date.toLocaleDateString({}, {month: "numeric", day: "numeric"}); } get time() { - return this._date.toLocaleTimeString({}, {hour: "numeric", minute: "2-digit"}); + return this._date && this._date.toLocaleTimeString({}, {hour: "numeric", minute: "2-digit"}); } get isOwn() { diff --git a/src/ui/web/session/room/timeline/TextMessageView.js b/src/ui/web/session/room/timeline/TextMessageView.js index 260eaf29..d3d8e167 100644 --- a/src/ui/web/session/room/timeline/TextMessageView.js +++ b/src/ui/web/session/room/timeline/TextMessageView.js @@ -20,7 +20,7 @@ import {renderMessage} from "./common.js"; export class TextMessageView extends TemplateView { render(t, vm) { return renderMessage(t, vm, - [t.p([vm.text, t.time(vm.date + " " + vm.time)])] + [t.p([vm.text, t.time({className: {hidden: !vm.date}}, vm.date + " " + vm.time)])] ); } }