Merge pull request RocketChat#226 from shubhsherl/fix_quote

Fix quote message redirection
bhardwajaditya · Apr 14, 2020 · e816159 · e816159
2 parents aed6b8d + 9b4fd0c
commit e816159
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/app/message-attachments/client/messageAttachment.html b/app/message-attachments/client/messageAttachment.html
@@ -18,9 +18,9 @@
 						<a href="{{author_link}}" target="_blank" rel="noopener noreferrer">{{author_name}}</a>
 						{{#if ts}}
 							{{#if message_link}}
-								<span class="time-link">
-									<a href="{{message_link}}" rel="noopener noreferrer">{{time}}</a>
-								</span>
+								<button type="button" class="time">
+									<span class="time-link">{{time}}</span>
+								</button>
 							{{else}}
 								{{#unless time}}
 									<span class="time">
@@ -38,9 +38,9 @@
 						{{author_name}}
 					{{#if ts}}
 						{{#if message_link}}
-							<span class="time-link">
-								<a href="{{message_link}}" rel="noopener noreferrer">{{time}}</a>
-							</span>
+							<button type="button" class="time">
+								<span class="time-link">{{time}}</span>
+							</button>
 						{{else}}
 							{{#unless time}}
 								<span class="time">

diff --git a/app/message-attachments/client/stylesheets/messageAttachments.css b/app/message-attachments/client/stylesheets/messageAttachments.css
@@ -57,8 +57,14 @@ html.rtl .attachment {
 			margin-bottom: -2px;
 		}
 
-		& .time,
+		& .time {
+			font-size: 0.8em;
+			font-weight: normal;
+		}
+
 		& .time-link {
+			color: #1d74f5;
+
 			font-size: 0.8em;
 			font-weight: normal;
 		}

diff --git a/app/ui/client/views/app/room.js b/app/ui/client/views/app/room.js
@@ -878,11 +878,13 @@ Template.room.events({
 
 		popover.open(config);
 	},
-	'click .time a'(e) {
+	'click .time-link'(e) {
 		e.preventDefault();
 		const { msg } = messageArgs(this);
-		const repliedMessageId = msg.attachments[0].message_link.split('?msg=')[1];
-		FlowRouter.go(FlowRouter.current().context.pathname, null, { msg: repliedMessageId, hash: Random.id() });
+		const link = msg.attachments ? msg.attachments[0].message_link : this.message_link;
+		const repliedMessageId = link.split('?msg=')[1];
+		const { pathname } = new URL(link);
+		FlowRouter.go(pathname, null, { msg: repliedMessageId, hash: Random.id() });
 	},
 	'click .mention-link'(e, instance) {
 		if (!Meteor.userId()) {