diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2019-03-14 10:18:18 +0100 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-04-10 11:49:06 -0700 |
commit | c57529556c2ba3053e3a622efc2f5b6eeaabe009 (patch) | |
tree | 1cb928c3fa9c214f083e2f8b1ccc292ebda438db /app/assets/javascripts/awards_handler.js | |
parent | ddab30ad3561c6834fd779458ce89084c8a95ca5 (diff) | |
download | gitlab-ce-c57529556c2ba3053e3a622efc2f5b6eeaabe009.tar.gz |
Revert "Merge branch 'tz-reorganise-digests-json' into 'master'"tz-revert-new-emojis-loading
Reverts the loading of emojis and its images to move forward with RC
Diffstat (limited to 'app/assets/javascripts/awards_handler.js')
-rw-r--r-- | app/assets/javascripts/awards_handler.js | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js index 3826ecd1ac1..743f11625bc 100644 --- a/app/assets/javascripts/awards_handler.js +++ b/app/assets/javascripts/awards_handler.js @@ -619,18 +619,10 @@ export class AwardsHandler { let awardsHandlerPromise = null; export default function loadAwardsHandler(reload = false) { if (!awardsHandlerPromise || reload) { - awardsHandlerPromise = new Promise((resolve, reject) => { - import(/* webpackChunkName: 'emoji' */ './emoji') - .then(Emoji => { - Emoji.initEmojiMap() - .then(() => { - const awardsHandler = new AwardsHandler(Emoji); - awardsHandler.bindEvents(); - resolve(awardsHandler); - }) - .catch(() => reject); - }) - .catch(() => reject); + awardsHandlerPromise = import(/* webpackChunkName: 'emoji' */ './emoji').then(Emoji => { + const awardsHandler = new AwardsHandler(Emoji); + awardsHandler.bindEvents(); + return awardsHandler; }); } return awardsHandlerPromise; |