summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/behaviors/gl_emoji.js
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2017-06-02 03:52:27 -0500
committerEric Eastwood <contact@ericeastwood.com>2017-06-02 15:44:14 -0500
commitc88d9cf34c97a27db55f9b90b29ede5d20a1f156 (patch)
tree923fa96f27cb788d8c228694b1eb8a12ea50de4d /app/assets/javascripts/behaviors/gl_emoji.js
parent256a8601fb3e762193973afff25152dcdab9930c (diff)
downloadgitlab-ce-c88d9cf34c97a27db55f9b90b29ede5d20a1f156.tar.gz
Fix NPE with horse racing emoji check32587-fix-horse-racing-emoji-codepointat-npe
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32587
Diffstat (limited to 'app/assets/javascripts/behaviors/gl_emoji.js')
-rw-r--r--app/assets/javascripts/behaviors/gl_emoji.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/behaviors/gl_emoji.js b/app/assets/javascripts/behaviors/gl_emoji.js
index 23d91fdb259..36ce4fddb72 100644
--- a/app/assets/javascripts/behaviors/gl_emoji.js
+++ b/app/assets/javascripts/behaviors/gl_emoji.js
@@ -88,6 +88,7 @@ function installGlEmojiElement() {
const hasCssSpriteFalback = fallbackSpriteClass && fallbackSpriteClass.length > 0;
if (
+ emojiUnicode &&
isEmojiUnicode &&
!isEmojiUnicodeSupported(generatedUnicodeSupportMap, emojiUnicode, unicodeVersion)
) {