Removes the CDN loading for emojis.json

59f26cea · Tim Zallmann · Filipa Lacerda · d8bbd3e7 · 59f26cea
Commit 59f26cea authored Mar 13, 2019 by Tim Zallmann Committed by Filipa Lacerda Mar 13, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

app/assets/javascripts/emoji/index.js app/assets/javascripts/emoji/index.js +1 -4

No files found.
--- a/app/assets/javascripts/emoji/index.js
+++ b/app/assets/javascripts/emoji/index.js
@@ -33,10 +33,7 @@ export function initEmojiMap() {
      }
      axiosInstance
-        .get(
+        .get(`${gon.relative_url_root || ''}/-/emojis/${EMOJI_VERSION}/emojis.json`)
-          `${gon.asset_host || ''}${gon.relative_url_root ||
-            ''}/-/emojis/${EMOJI_VERSION}/emojis.json`,
-        )
        .then(({ data }) => {
          emojiMap = data;
          validEmojiNames = [...Object.keys(emojiMap), ...Object.keys(emojiAliases)];