diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2019-03-14 12:18:18 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-04-10 21:49:06 +0300 |
commit | c57529556c2ba3053e3a622efc2f5b6eeaabe009 (patch) | |
tree | 1cb928c3fa9c214f083e2f8b1ccc292ebda438db /app/assets/javascripts/gfm_auto_complete.js | |
parent | ddab30ad3561c6834fd779458ce89084c8a95ca5 (diff) |
Revert "Merge branch 'tz-reorganise-digests-json' into 'master'"
Reverts the loading of emojis and its images to move forward with RC
Diffstat (limited to 'app/assets/javascripts/gfm_auto_complete.js')
-rw-r--r-- | app/assets/javascripts/gfm_auto_complete.js | 12 |
1 files changed, 3 insertions, 9 deletions
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; |