From e9ee249fd50760e13dd02712cbe496f1d660912b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= Date: Tue, 1 Aug 2017 00:16:05 +0200 Subject: [PATCH] do not emojify tm, (R) and (C) (#4472) --- app/javascript/mastodon/emoji.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/javascript/mastodon/emoji.js b/app/javascript/mastodon/emoji.js index 9b58cacf59b..5695c86dd35 100644 --- a/app/javascript/mastodon/emoji.js +++ b/app/javascript/mastodon/emoji.js @@ -3,6 +3,8 @@ import Trie from 'substring-trie'; const trie = new Trie(Object.keys(unicodeMapping)); +const excluded = ['™', '©', '®']; + function emojify(str) { // This walks through the string from start to end, ignoring any tags (

,
, etc.) // and replacing valid unicode strings @@ -19,7 +21,7 @@ function emojify(str) { insideTag = true; } else if (!insideTag && (match = trie.search(str.substring(i)))) { const unicodeStr = match; - if (unicodeStr in unicodeMapping) { + if (unicodeStr in unicodeMapping && excluded.indexOf(unicodeStr) === -1) { const [filename, shortCode] = unicodeMapping[unicodeStr]; const alt = unicodeStr; const replacement = `${alt}`;