Fix error at emoji_compressed in Firefox ESR (#5241)

2017-10-06 14:40:41 +00:00
parent daa59dd454
commit 6f2d88dd28
1 changed files with 3 additions and 1 deletions
--- a/app/javascript/mastodon/features/emoji/emoji_compressed.js
+++ b/app/javascript/mastodon/features/emoji/emoji_compressed.js
@@ -54,7 +54,9 @@ Object.keys(emojiMap).forEach(key => {
  if (typeof shortcode === 'undefined') {
    emojisWithoutShortCodes.push(filenameData);
  } else {
-    shortCodesToEmojiData[shortcode] = shortCodesToEmojiData[shortcode] || [[]];
+    if (!Array.isArray(shortCodesToEmojiData[shortcode])) {
+      shortCodesToEmojiData[shortcode] = [[]];
+    }
    shortCodesToEmojiData[shortcode][0].push(filenameData);
  }
 });