From abe05b6102a368e8d99570f539f939e4eabe97ff Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso@tassoevan.me>
Date: Tue, 23 Apr 2019 09:03:17 -0700
Subject: [PATCH] Regression: Broken UI for messages (#14223)

* Move .inline-image out .body

* Make emoji parser aware it is checking DOM nodes instead of elements

* Render thread title in thread tab as HTML
---
 app/emoji/client/emojiParser.js               |  2 +-
 app/theme/client/imports/general/base_old.css | 40 +++++++++----------
 app/threads/client/flextab/thread.html        |  2 +-
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/app/emoji/client/emojiParser.js b/app/emoji/client/emojiParser.js
index 809b3c41569..503de3c1194 100644
--- a/app/emoji/client/emojiParser.js
+++ b/app/emoji/client/emojiParser.js
@@ -38,7 +38,7 @@ Tracker.autorun(() => {
 					continue;
 				}
 
-				if (s.trim(childNode.innerText) === '') {
+				if (s.trim(childNode.nodeValue) === '') {
 					continue;
 				}
 
diff --git a/app/theme/client/imports/general/base_old.css b/app/theme/client/imports/general/base_old.css
index bff94cd7f1f..17bb4bfc8e6 100644
--- a/app/theme/client/imports/general/base_old.css
+++ b/app/theme/client/imports/general/base_old.css
@@ -2899,26 +2899,6 @@ rc-old select,
 
 		opacity: 1;
 
-		& .inline-image {
-			display: inline-block;
-
-			border-radius: 3px;
-			background-repeat: no-repeat;
-			background-position: center left;
-			background-size: contain;
-			box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
-
-			line-height: 0;
-
-			& img {
-				max-width: 100%;
-				max-height: 200px;
-
-				cursor: pointer;
-				object-fit: contain;
-			}
-		}
-
 		& > h1 {
 			font-size: 3em;
 			line-height: 1em;
@@ -2997,6 +2977,26 @@ rc-old select,
 		font-weight: 400;
 	}
 
+	& .inline-image {
+		display: inline-block;
+
+		border-radius: 3px;
+		background-repeat: no-repeat;
+		background-position: center left;
+		background-size: contain;
+		box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
+
+		line-height: 0;
+
+		& img {
+			max-width: 100%;
+			max-height: 200px;
+
+			cursor: pointer;
+			object-fit: contain;
+		}
+	}
+
 	&.livechat_navigation_history {
 		& .thumb,
 		& .user,
diff --git a/app/threads/client/flextab/thread.html b/app/threads/client/flextab/thread.html
index 5dee194d046..406b3cf0c4c 100644
--- a/app/threads/client/flextab/thread.html
+++ b/app/threads/client/flextab/thread.html
@@ -3,7 +3,7 @@
 		<div class="contextual-bar__header-data">
 			{{> icon block="contextual-bar__header-icon" icon='thread'}}
 			<h2 class="contextual-bar__header-title">
-				<span class="message-body--unstyled">{{threadTitle}}</span>
+				<span class="message-body--unstyled">{{{threadTitle}}}</span>
 				{{!-- <sub class="contextual-bar__header-description">{{room.fname}}</sub> --}}
 			</h2>
 		</div>