diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-10 20:36:29 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-10 20:36:29 +0000 |
commit | 1eef146c2d1de19d4e995d421e5787053e50db80 (patch) | |
tree | 2761efabea712248557826977a849e31e3fdb961 /app/assets | |
parent | 661d663ab2b7c69977ba8a0db02ef4afc2427e39 (diff) | |
download | gitlab-ce-1eef146c2d1de19d4e995d421e5787053e50db80.tar.gz |
Add latest changes from gitlab-org/security/gitlab@14-6-stable-ee
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/behaviors/gl_emoji.js | 6 | ||||
-rw-r--r-- | app/assets/javascripts/emoji/index.js | 15 |
2 files changed, 18 insertions, 3 deletions
diff --git a/app/assets/javascripts/behaviors/gl_emoji.js b/app/assets/javascripts/behaviors/gl_emoji.js index 8fe90b6bb15..8fd03d3132d 100644 --- a/app/assets/javascripts/behaviors/gl_emoji.js +++ b/app/assets/javascripts/behaviors/gl_emoji.js @@ -64,10 +64,12 @@ class GlEmoji extends HTMLElement { this.classList.add('emoji-icon'); this.classList.add(fallbackSpriteClass); } else if (hasImageFallback) { - this.innerHTML = emojiImageTag(name, fallbackSrc); + this.innerHTML = ''; + this.appendChild(emojiImageTag(name, fallbackSrc)); } else { const src = emojiFallbackImageSrc(name); - this.innerHTML = emojiImageTag(name, src); + this.innerHTML = ''; + this.appendChild(emojiImageTag(name, src)); } } }); diff --git a/app/assets/javascripts/emoji/index.js b/app/assets/javascripts/emoji/index.js index b507792cc91..aaae1624bee 100644 --- a/app/assets/javascripts/emoji/index.js +++ b/app/assets/javascripts/emoji/index.js @@ -1,6 +1,7 @@ import { escape, minBy } from 'lodash'; import emojiRegexFactory from 'emoji-regex'; import emojiAliases from 'emojis/aliases.json'; +import { setAttributes } from '~/lib/utils/dom_utils'; import AccessorUtilities from '../lib/utils/accessor'; import axios from '../lib/utils/axios_utils'; import { CACHE_KEY, CACHE_VERSION_KEY, CATEGORY_ICON_MAP, FREQUENTLY_USED_KEY } from './constants'; @@ -220,7 +221,19 @@ export function emojiFallbackImageSrc(inputName) { } export function emojiImageTag(name, src) { - return `<img class="emoji" title=":${name}:" alt=":${name}:" src="${src}" width="20" height="20" align="absmiddle" />`; + const img = document.createElement('img'); + + img.className = 'emoji'; + setAttributes(img, { + title: `:${name}:`, + alt: `:${name}:`, + src, + width: '20', + height: '20', + align: 'absmiddle', + }); + + return img; } export function glEmojiTag(inputName, options) { |