diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 10:00:54 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 10:00:54 +0000 |
| commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
| tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /app/assets/javascripts/emoji/index.js | |
| parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) | |
| download | gitlab-ce-3cccd102ba543e02725d247893729e5c73b38295.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'app/assets/javascripts/emoji/index.js')
| -rw-r--r-- | app/assets/javascripts/emoji/index.js | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/javascripts/emoji/index.js b/app/assets/javascripts/emoji/index.js index aaae1624bee..4fdcdcc1b04 100644 --- a/app/assets/javascripts/emoji/index.js +++ b/app/assets/javascripts/emoji/index.js @@ -245,5 +245,12 @@ export function glEmojiTag(inputName, options) { ? `data-fallback-sprite-class="${escape(fallbackSpriteClass)}" ` : ''; - return `<gl-emoji ${fallbackSpriteAttribute}data-name="${escape(name)}"></gl-emoji>`; + const fallbackUrl = opts.url; + const fallbackSrcAttribute = fallbackUrl + ? `data-fallback-src="${fallbackUrl}" data-unicode-version="custom"` + : ''; + + return `<gl-emoji ${fallbackSrcAttribute}${fallbackSpriteAttribute}data-name="${escape( + name, + )}"></gl-emoji>`; } |