hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix error at emoji_compressed in Firefox ESR (#5241)

signup-info-prompt
MIYAGI Hikaru 2017-10-06 14:40:41 +00:00 committed by Eugen Rochko
parent daa59dd454
commit 6f2d88dd28
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/mastodon/features/emoji/emoji_compressed.js
View File

@ -54,7 +54,9 @@ Object.keys(emojiMap).forEach(key => {
if (typeof shortcode === 'undefined') { if (typeof shortcode === 'undefined') {
emojisWithoutShortCodes.push(filenameData); emojisWithoutShortCodes.push(filenameData);
} else { } else {
shortCodesToEmojiData[shortcode] = shortCodesToEmojiData[shortcode] || [[]]; if (!Array.isArray(shortCodesToEmojiData[shortcode])) {
shortCodesToEmojiData[shortcode] = [[]];
}
shortCodesToEmojiData[shortcode][0].push(filenameData); shortCodesToEmojiData[shortcode][0].push(filenameData);
} }
}); });