move normalizeEmojiName method to emoji helper module

2 files changed, 11 insertions, 12 deletions

diff --git a/app/assets/javascripts/emoji/index.js b/app/assets/javascripts/emoji/index.js
index 1e86ce822d2..ad4cdfb4355 100644
--- a/app/assets/javascripts/emoji/index.js
+++ b/app/assets/javascripts/emoji/index.js
@@ -1,12 +1,22 @@
 import emojiMap from 'emojis/digests.json';
 import emojiAliases from 'emojis/aliases.json';
 import getUnicodeSupportMap from './unicode_support_map';
-import isEmojiNameValid from './is_emoji_name_valid';
 import isEmojiUnicodeSupported from './is_emoji_unicode_supported';
 
+const validEmojiNames = [...Object.keys(emojiMap), ...Object.keys(emojiAliases)];
+
+function normalizeEmojiName(name) {
+  return Object.prototype.hasOwnProperty.call(emojiAliases, name) ? emojiAliases[name] : name;
+}
+
+function isEmojiNameValid(name) {
+  return validEmojiNames.indexOf(name) >= 0;
+}
+
 export {
   emojiMap,
   emojiAliases,
+  normalizeEmojiName,
   getUnicodeSupportMap,
   isEmojiNameValid,
   isEmojiUnicodeSupported,
diff --git a/app/assets/javascripts/emoji/is_emoji_name_valid.js b/app/assets/javascripts/emoji/is_emoji_name_valid.js
deleted file mode 100644
index be4aeb32c46..00000000000
--- a/app/assets/javascripts/emoji/is_emoji_name_valid.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import emojiMap from 'emojis/digests.json';
-import emojiAliases from 'emojis/aliases.json';
-
-function isEmojiNameValid(inputName) {
-  const name = Object.prototype.hasOwnProperty.call(emojiAliases, inputName) ?
-    emojiAliases[inputName] : inputName;
-
-  return name && emojiMap[name];
-}
-
-export default isEmojiNameValid;