From 527e7edbc4251644867ef02a2e055815d3f28a82 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Mon, 26 Jun 2017 17:05:43 -0500 Subject: replace emojiAlias references with normalizeEmojiName helper --- app/assets/javascripts/behaviors/gl_emoji.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'app/assets/javascripts') diff --git a/app/assets/javascripts/behaviors/gl_emoji.js b/app/assets/javascripts/behaviors/gl_emoji.js index 06eb698378c..3a29254cf99 100644 --- a/app/assets/javascripts/behaviors/gl_emoji.js +++ b/app/assets/javascripts/behaviors/gl_emoji.js @@ -1,5 +1,5 @@ import installCustomElements from 'document-register-element'; -import { emojiMap, emojiAliases, isEmojiUnicodeSupported, getUnicodeSupportMap } from '../emoji'; +import { emojiMap, normalizeEmojiName, isEmojiUnicodeSupported, getUnicodeSupportMap } from '../emoji'; installCustomElements(window); @@ -10,8 +10,7 @@ function emojiImageTag(name, src) { } function assembleFallbackImageSrc(inputName) { - let name = Object.prototype.hasOwnProperty.call(emojiAliases, inputName) ? - emojiAliases[inputName] : inputName; + let name = normalizeEmojiName(inputName); let emojiInfo = emojiMap[name]; // Fallback to question mark for unknown emojis if (!emojiInfo) { @@ -25,8 +24,7 @@ function assembleFallbackImageSrc(inputName) { function glEmojiTag(inputName, options) { const opts = { sprite: false, forceFallback: false, ...options }; - let name = Object.prototype.hasOwnProperty.call(emojiAliases, inputName) ? - emojiAliases[inputName] : inputName; + let name = normalizeEmojiName(inputName); let emojiInfo = emojiMap[name]; // Fallback to question mark for unknown emojis if (!emojiInfo) { -- cgit v1.2.1