diff options
| author | ThibG <thib@sitedethib.com> | 2020-06-10 12:12:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-10 12:12:14 +0200 |
| commit | 0a5cf075cdddbbe40e79ebad8ee2b1abd62d3200 (patch) | |
| tree | 313cace275cee0d74fac462a4a919955d50ac440 | |
| parent | 34d92e023332ce492748866a4373593d2ab849e8 (diff) | |
| parent | b9d75e49c275357d06a2e120d187d3a4ede5ecb7 (diff) | |
Merge pull request #1356 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
| -rw-r--r-- | app/javascript/mastodon/features/emoji/emoji.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/emoji/emoji.js b/app/javascript/mastodon/features/emoji/emoji.js index 382ba683f..7bcda63eb 100644 --- a/app/javascript/mastodon/features/emoji/emoji.js +++ b/app/javascript/mastodon/features/emoji/emoji.js @@ -11,7 +11,7 @@ const darkEmoji = 'π±πβ«π€β¬βΌοΈβΎβΌοΈβοΈβͺοΈπ£π³π·πΈ const lightEmoji = 'π½βΎπβοΈπ¨ποΈππ₯π»πβββΈοΈπ©οΈππππ§οΈππππππβ οΈπ¨οΈπππ¬πππ³οΈβͺβ¬β½β»οΈβ«οΈ'; const emojiFilename = (filename, match) => { - const borderedEmoji = document.body.classList.contains('theme-mastodon-light') ? lightEmoji : darkEmoji; + const borderedEmoji = (document.body && document.body.classList.contains('theme-mastodon-light')) ? lightEmoji : darkEmoji; return borderedEmoji.includes(match) ? (filename + '_border') : filename; }; |