Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2019-03-14 12:18:18 +0300
committerStan Hu <stanhu@gmail.com>2019-04-10 21:49:06 +0300
commitc57529556c2ba3053e3a622efc2f5b6eeaabe009 (patch)
tree1cb928c3fa9c214f083e2f8b1ccc292ebda438db /app/assets/javascripts/awards_handler.js
parentddab30ad3561c6834fd779458ce89084c8a95ca5 (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/awards_handler.js')
-rw-r--r--app/assets/javascripts/awards_handler.js16
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;