Revert "Merge branch 'tz-reorganise-digests-json' into 'master'"

Reverts the loading of emojis and its images to move forward with RC

1 files changed, 22 insertions, 26 deletions

diff --git a/app/assets/javascripts/pages/profiles/show/index.js b/app/assets/javascripts/pages/profiles/show/index.js
index c9d3bbc8c39..0dd0d5336fc 100644
--- a/app/assets/javascripts/pages/profiles/show/index.js
+++ b/app/assets/javascripts/pages/profiles/show/index.js
@@ -56,34 +56,30 @@ document.addEventListener('DOMContentLoaded', () => {
 
   import(/* webpackChunkName: 'emoji' */ '~/emoji')
     .then(Emoji => {
-      Emoji.initEmojiMap()
-        .then(() => {
-          const emojiMenu = new EmojiMenu(
-            Emoji,
-            toggleEmojiMenuButtonSelector,
-            'js-status-emoji-menu',
-            selectEmojiCallback,
-          );
-          emojiMenu.bindEvents();
+      const emojiMenu = new EmojiMenu(
+        Emoji,
+        toggleEmojiMenuButtonSelector,
+        'js-status-emoji-menu',
+        selectEmojiCallback,
+      );
+      emojiMenu.bindEvents();
 
-          const defaultEmojiTag = Emoji.glEmojiTag(defaultStatusEmoji);
-          statusMessageField.addEventListener('input', () => {
-            const hasStatusMessage = statusMessageField.value.trim() !== '';
-            const statusEmoji = findStatusEmoji();
-            if (hasStatusMessage && statusEmoji) {
-              return;
-            }
+      const defaultEmojiTag = Emoji.glEmojiTag(defaultStatusEmoji);
+      statusMessageField.addEventListener('input', () => {
+        const hasStatusMessage = statusMessageField.value.trim() !== '';
+        const statusEmoji = findStatusEmoji();
+        if (hasStatusMessage && statusEmoji) {
+          return;
+        }
 
-            if (hasStatusMessage) {
-              toggleNoEmojiPlaceholder(false);
-              toggleEmojiMenuButton.innerHTML += defaultEmojiTag;
-            } else if (statusEmoji.dataset.name === defaultStatusEmoji) {
-              toggleNoEmojiPlaceholder(true);
-              removeStatusEmoji();
-            }
-          });
-        })
-        .catch(() => createFlash('Failed to load emoji list.'));
+        if (hasStatusMessage) {
+          toggleNoEmojiPlaceholder(false);
+          toggleEmojiMenuButton.innerHTML += defaultEmojiTag;
+        } else if (statusEmoji.dataset.name === defaultStatusEmoji) {
+          toggleNoEmojiPlaceholder(true);
+          removeStatusEmoji();
+        }
+      });
     })
     .catch(() => createFlash('Failed to load emoji list.'));
 });