From c57529556c2ba3053e3a622efc2f5b6eeaabe009 Mon Sep 17 00:00:00 2001 From: Tim Zallmann Date: Thu, 14 Mar 2019 10:18:18 +0100 Subject: Revert "Merge branch 'tz-reorganise-digests-json' into 'master'" Reverts the loading of emojis and its images to move forward with RC --- app/assets/javascripts/gfm_auto_complete.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'app/assets/javascripts/gfm_auto_complete.js') diff --git a/app/assets/javascripts/gfm_auto_complete.js b/app/assets/javascripts/gfm_auto_complete.js index 50ea13edf63..c81e754df4c 100644 --- a/app/assets/javascripts/gfm_auto_complete.js +++ b/app/assets/javascripts/gfm_auto_complete.js @@ -487,15 +487,9 @@ class GfmAutoComplete { this.loadData($input, at, this.cachedData[at]); } else if (GfmAutoComplete.atTypeMap[at] === 'emojis') { import(/* webpackChunkName: 'emoji' */ './emoji') - .then(({ initEmojiMap, getValidEmojiNames, glEmojiTag }) => { - initEmojiMap() - .then(() => { - this.loadData($input, at, getValidEmojiNames()); - GfmAutoComplete.glEmojiTag = glEmojiTag; - }) - .catch(() => { - this.isLoadingData[at] = false; - }); + .then(({ validEmojiNames, glEmojiTag }) => { + this.loadData($input, at, validEmojiNames); + GfmAutoComplete.glEmojiTag = glEmojiTag; }) .catch(() => { this.isLoadingData[at] = false; -- cgit v1.2.3