diff options
author | Mike Greiling <mike@pixelcog.com> | 2017-06-24 01:41:49 -0500 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2017-06-26 14:10:01 -0500 |
commit | b7a0044a70020bf97d9f1d604f126ab23db3dc93 (patch) | |
tree | c7ddfbfb63cc652d029609576ddde46f6b0f7670 /app/assets/javascripts/awards_handler.js | |
parent | 35ee21d992a8d2fa65ee7601c8948dbf79b54c53 (diff) | |
download | gitlab-ce-b7a0044a70020bf97d9f1d604f126ab23db3dc93.tar.gz |
move normalizeEmojiName method to emoji helper module
Diffstat (limited to 'app/assets/javascripts/awards_handler.js')
-rw-r--r-- | app/assets/javascripts/awards_handler.js | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js index 2bae4f4d955..27b61a0c61f 100644 --- a/app/assets/javascripts/awards_handler.js +++ b/app/assets/javascripts/awards_handler.js @@ -3,7 +3,7 @@ import Cookies from 'js-cookie'; import { glEmojiTag } from './behaviors/gl_emoji'; -import { emojiMap, emojiAliases, isEmojiNameValid } from './emoji'; +import { emojiMap, emojiAliases, isEmojiNameValid, normalizeEmojiName } from './emoji'; const animationEndEventString = 'animationend webkitAnimationEnd MSAnimationEnd oAnimationEnd'; const transitionEndEventString = 'transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd'; @@ -65,7 +65,6 @@ function renderCategory(name, emojiList, opts = {}) { export default class AwardsHandler { constructor() { this.eventListeners = []; - this.aliases = emojiAliases; // If the user shows intent let's pre-build the menu this.registerEventListener('one', $(document), 'mouseenter focus', '.js-add-award', 'mouseenter focus', () => { const $menu = $('.emoji-menu'); @@ -260,7 +259,7 @@ export default class AwardsHandler { checkMutuality, callback, ) { - const normalizedEmoji = this.normalizeEmojiName(emoji); + const normalizedEmoji = normalizeEmojiName(emoji); const $emojiButton = this.findEmojiIcon(votesBlock, normalizedEmoji).parent(); this.postEmoji($emojiButton, awardUrl, normalizedEmoji, () => { this.addAwardToEmojiBar(votesBlock, normalizedEmoji, checkMutuality); @@ -279,7 +278,7 @@ export default class AwardsHandler { this.checkMutuality(votesBlock, emoji); } this.addEmojiToFrequentlyUsedList(emoji); - const normalizedEmoji = this.normalizeEmojiName(emoji); + const normalizedEmoji = normalizeEmojiName(emoji); const $emojiButton = this.findEmojiIcon(votesBlock, normalizedEmoji).parent(); if ($emojiButton.length > 0) { if (this.isActive($emojiButton)) { @@ -469,10 +468,6 @@ export default class AwardsHandler { return $('body, html').animate(options, 200); } - normalizeEmojiName(emoji) { - return Object.prototype.hasOwnProperty.call(this.aliases, emoji) ? this.aliases[emoji] : emoji; - } - addEmojiToFrequentlyUsedList(emoji) { if (isEmojiNameValid(emoji)) { this.frequentlyUsedEmojis = _.uniq(this.getFrequentlyUsedEmojis().concat(emoji)); |