From 7f916532088cc1f584d64c8012263d1d9db0f657 Mon Sep 17 00:00:00 2001 From: RMidhunSuresh Date: Thu, 6 Jan 2022 22:38:37 +0530 Subject: [PATCH] Rename replyTextTile -> replyTile --- .../session/room/timeline/tiles/BaseMessageTile.js | 10 +++++----- src/domain/session/room/timeline/tiles/SimpleTile.js | 4 ++-- .../web/ui/session/room/timeline/TextMessageView.js | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/domain/session/room/timeline/tiles/BaseMessageTile.js b/src/domain/session/room/timeline/tiles/BaseMessageTile.js index ef0c2c39..174cdd0a 100644 --- a/src/domain/session/room/timeline/tiles/BaseMessageTile.js +++ b/src/domain/session/room/timeline/tiles/BaseMessageTile.js @@ -24,7 +24,7 @@ export class BaseMessageTile extends SimpleTile { this._date = this._entry.timestamp ? new Date(this._entry.timestamp) : null; this._isContinuation = false; this._reactions = null; - this._replyTextTile = null; + this._replyTile = null; if (this._entry.annotations || this._entry.pendingAnnotations) { this._updateReactions(); } @@ -216,16 +216,16 @@ export class BaseMessageTile extends SimpleTile { } } - get replyTextTile() { + get replyTile() { if (!this._entry.contextEventId) { return null; } - if (!this._replyTextTile) { + if (!this._replyTile) { const entry = this._entry.contextEntry; if (entry) { - this._replyTextTile = this._tileCreator(entry); + this._replyTile = this._tileCreator(entry); } } - return this._replyTextTile; + return this._replyTile; } } diff --git a/src/domain/session/room/timeline/tiles/SimpleTile.js b/src/domain/session/room/timeline/tiles/SimpleTile.js index 3ba78548..4174413a 100644 --- a/src/domain/session/room/timeline/tiles/SimpleTile.js +++ b/src/domain/session/room/timeline/tiles/SimpleTile.js @@ -97,9 +97,9 @@ export class SimpleTile extends ViewModel { const replyEntry = param?.reply ?? entry.contextEntry; if (replyEntry) { // this is an update to contextEntry used for replyPreview - const action = this._replyTextTile?.updateEntry(replyEntry); + const action = this._replyTile?.updateEntry(replyEntry); if (action?.shouldReplace) { - this._replyTextTile = this._tileCreator(replyEntry); + this._replyTile = this._tileCreator(replyEntry); } } const renderedAsRedacted = this.shape === "redacted"; diff --git a/src/platform/web/ui/session/room/timeline/TextMessageView.js b/src/platform/web/ui/session/room/timeline/TextMessageView.js index 489294c3..fe34f850 100644 --- a/src/platform/web/ui/session/room/timeline/TextMessageView.js +++ b/src/platform/web/ui/session/room/timeline/TextMessageView.js @@ -26,13 +26,13 @@ export class TextMessageView extends BaseMessageView { "Timeline_messageBody": true, statusMessage: vm => vm.shape === "message-status", } - }, t.mapView(vm => vm.replyTextTile, replyTextTile => { - if (vm.isReply && !replyTextTile) { + }, t.mapView(vm => vm.replyTile, replyTile => { + if (vm.isReply && !replyTile) { return new ReplyPreviewError(); } - else if (replyTextTile && !this._isReplyPreview) { + else if (replyTile && !this._isReplyPreview) { // if this._isReplyPreview = true, this is already a reply preview, don't nest replies for now. - return new ReplyPreviewView(replyTextTile); + return new ReplyPreviewView(replyTile); } else { return null;