kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Removed usage of normilizeEmojiName method

Browse source 
Fixed some Ruby based on feedback
This commit is contained in:
Phil Hughes 2016-04-22 21:53:26 +01:00
parent 319c936055
commit 13f7ba059e
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/awards_handler.coffee
View file

@ -55,7 +55,6 @@ class @AwardsHandler
, 200 , 200
addAward: (emoji) -> addAward: (emoji) ->
emoji = @normilizeEmojiName(emoji)
@postEmoji emoji, => @postEmoji emoji, =>
@addAwardToEmojiBar(emoji) @addAwardToEmojiBar(emoji)
@ -64,7 +63,6 @@ class @AwardsHandler
addAwardToEmojiBar: (emoji) -> addAwardToEmojiBar: (emoji) ->
@addEmojiToFrequentlyUsedList(emoji) @addEmojiToFrequentlyUsedList(emoji)
emoji = @normilizeEmojiName(emoji)
if @exist(emoji) if @exist(emoji)
if @isActive(emoji) if @isActive(emoji)
@decrementCounter(emoji) @decrementCounter(emoji)
@ -165,9 +163,6 @@ class @AwardsHandler
scrollTop: $('.awards').offset().top - 80 scrollTop: $('.awards').offset().top - 80
}, 200) }, 200)
normilizeEmojiName: (emoji) ->
emoji
addEmojiToFrequentlyUsedList: (emoji) -> addEmojiToFrequentlyUsedList: (emoji) ->
frequently_used_emojis = @getFrequentlyUsedEmojis() frequently_used_emojis = @getFrequentlyUsedEmojis()
frequently_used_emojis.push(emoji) frequently_used_emojis.push(emoji)

3
lib/award_emoji.rb
View file

@ -53,8 +53,7 @@ class AwardEmoji
end end
def self.unicode def self.unicode
emojis @unicode ||= emojis.map {|key, value| { key => emojis[key]["unicode"] } }.inject(:merge!)
emojis.map{|key, value| { key => emojis[key]["unicode"] } }.inject(:merge!)
end end
def self.aliases def self.aliases