From cc6b8a96155a26f3ac0e51f41b1a00bd533fbb76 Mon Sep 17 00:00:00 2001 From: ThibG <thib@sitedethib.com> Date: Tue, 9 Jun 2020 20:53:20 +0200 Subject: [PATCH] Fix WebUI crash when processing accounts before page is loaded (#14015) --- app/javascript/mastodon/features/emoji/emoji.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; };