about summary refs log tree commit diff
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2020-06-10 12:10:26 +0200
committerThibaut Girka <thib@sitedethib.com>2020-06-10 12:10:26 +0200
commitb9d75e49c275357d06a2e120d187d3a4ede5ecb7 (patch)
tree313cace275cee0d74fac462a4a919955d50ac440
parent34d92e023332ce492748866a4373593d2ab849e8 (diff)
parentcc6b8a96155a26f3ac0e51f41b1a00bd533fbb76 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
-rw-r--r--app/javascript/mastodon/features/emoji/emoji.js2
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;
 };