From: Thibaut Girka Date: Tue, 9 Jun 2020 09:55:07 +0000 (+0200) Subject: [Glitch] Fix WebUI crash when loading account data before page is loaded X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=e9d7ca7645fc37534df1222e8d7ab8f3d533b852;p=mastodon.git [Glitch] Fix WebUI crash when loading account data before page is loaded --- diff --git a/app/javascript/flavours/glitch/util/emoji/index.js b/app/javascript/flavours/glitch/util/emoji/index.js index bd3c083e3..22b657b05 100644 --- a/app/javascript/flavours/glitch/util/emoji/index.js +++ b/app/javascript/flavours/glitch/util/emoji/index.js @@ -11,7 +11,7 @@ const darkEmoji = '🎱🐜⚫🖤⬛◼️◾◼️✒️▪️💣🎳📷📸 const lightEmoji = '👽⚾🐔☁️💨🕊️👀🍥👻🐐❕❔⛸️🌩️🔊🔇📃🌧️🐏🍚🍙🐓🐑💀☠️🌨️🔉🔈💬💭🏐🏳️⚪⬜◽◻️▫️'; const emojiFilename = (filename, match) => { - const borderedEmoji = document.body.classList.contains('skin-mastodon-light') ? lightEmoji : darkEmoji; + const borderedEmoji = (document.body && document.body.classList.contains('skin-mastodon-light')) ? lightEmoji : darkEmoji; return borderedEmoji.includes(match) ? (filename + '_border') : filename; };