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/set_status_modal | |
| 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/set_status_modal')
| -rw-r--r-- | app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue b/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue index e9ed05e30cd..7f86741ed29 100644 --- a/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue +++ b/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue @@ -66,23 +66,19 @@ export default { import(/* webpackChunkName: 'emoji' */ '~/emoji') .then(Emoji => { - Emoji.initEmojiMap() - .then(() => { - if (this.emoji) { - this.emojiTag = Emoji.glEmojiTag(this.emoji); - } - this.noEmoji = this.emoji === ''; - this.defaultEmojiTag = Emoji.glEmojiTag('speech_balloon'); + if (this.emoji) { + this.emojiTag = Emoji.glEmojiTag(this.emoji); + } + this.noEmoji = this.emoji === ''; + this.defaultEmojiTag = Emoji.glEmojiTag('speech_balloon'); - this.emojiMenu = new EmojiMenuInModal( - Emoji, - toggleEmojiMenuButtonSelector, - emojiMenuClass, - this.setEmoji, - this.$refs.userStatusForm, - ); - }) - .catch(() => createFlash(__('Failed to load emoji list.'))); + this.emojiMenu = new EmojiMenuInModal( + Emoji, + toggleEmojiMenuButtonSelector, + emojiMenuClass, + this.setEmoji, + this.$refs.userStatusForm, + ); }) .catch(() => createFlash(__('Failed to load emoji list.'))); }, |