diff options
author | Mike Greiling <mike@pixelcog.com> | 2017-06-27 01:27:06 -0500 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2017-06-28 13:04:34 -0500 |
commit | 8bb2013279a0f9116c01374b55401f3ca0d51c24 (patch) | |
tree | 0746f9277edb9631c029740b73a576485ecc710c | |
parent | 2874bab422f5b8342884c019bc39e0922beca469 (diff) | |
download | gitlab-ce-8bb2013279a0f9116c01374b55401f3ca0d51c24.tar.gz |
dynamically import emoji helpers for gl-emoji custom tag prototype
-rw-r--r-- | app/assets/javascripts/behaviors/gl_emoji.js | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/app/assets/javascripts/behaviors/gl_emoji.js b/app/assets/javascripts/behaviors/gl_emoji.js index 8156e491a42..7e98e04303a 100644 --- a/app/assets/javascripts/behaviors/gl_emoji.js +++ b/app/assets/javascripts/behaviors/gl_emoji.js @@ -1,5 +1,4 @@ import installCustomElements from 'document-register-element'; -import { emojiImageTag, emojiFallbackImageSrc } from '../emoji'; import isEmojiUnicodeSupported from '../emoji/support'; installCustomElements(window); @@ -32,11 +31,19 @@ export default function installGlEmojiElement() { // IE 11 doesn't like adding multiple at once :( this.classList.add('emoji-icon'); this.classList.add(fallbackSpriteClass); - } else if (hasImageFallback) { - this.innerHTML = emojiImageTag(name, fallbackSrc); } else { - const src = emojiFallbackImageSrc(name); - this.innerHTML = emojiImageTag(name, src); + import(/* webpackChunkName: 'emoji' */ '../emoji') + .then(({ emojiImageTag, emojiFallbackImageSrc }) => { + if (hasImageFallback) { + this.innerHTML = emojiImageTag(name, fallbackSrc); + } else { + const src = emojiFallbackImageSrc(name); + this.innerHTML = emojiImageTag(name, src); + } + }) + .catch(() => { + // do nothing + }); } } }; |