Merge remote-tracking branch 'origin/8-7-stable' into 'dev/8-7-stable'

app/assets/javascripts/awards_handler.coffee

 class @AwardsHandler
-  constructor: (@get_emojis_url, @post_emoji_url, @noteable_type, @noteable_id, @aliases) ->
+  constructor: (@get_emojis_url, @post_emoji_url, @noteable_type, @noteable_id, @unicodes) ->
     $(".js-add-award").on "click", (event) =>
       event.stopPropagation()
       event.preventDefault()
@@ -57,7 +57,6 @@ class @AwardsHandler
         , 200
 
   addAward: (emoji) ->
-    emoji = @normilizeEmojiName(emoji)
     @postEmoji emoji, =>
       @addAwardToEmojiBar(emoji)
 
@@ -66,7 +65,6 @@ class @AwardsHandler
   addAwardToEmojiBar: (emoji) ->
     @addEmojiToFrequentlyUsedList(emoji)
 
-    emoji = @normilizeEmojiName(emoji)
     if @exist(emoji)
       if @isActive(emoji)
         @decrementCounter(emoji)
@@ -148,15 +146,7 @@ class @AwardsHandler
     $('.award-control').tooltip()
 
   resolveNameToCssClass: (emoji) ->
-    emoji_icon = $(".emoji-menu-content [data-emoji='#{emoji}']")
-
-    if emoji_icon.length > 0
-      unicodeName = emoji_icon.data("unicode-name")
-    else
-      # Find by alias
-      unicodeName = $(".emoji-menu-content [data-aliases*=':#{emoji}:']").data("unicode-name")
-
-    "emoji-#{unicodeName}"
+    "emoji-#{@unicodes[emoji]}"
 
   postEmoji: (emoji, callback) ->
     $.post @post_emoji_url, { note: {
@@ -175,9 +165,6 @@ class @AwardsHandler
       scrollTop: $('.awards').offset().top - 80
     }, 200)
 
-  normilizeEmojiName: (emoji) ->
-    @aliases[emoji] || emoji
-
   addEmojiToFrequentlyUsedList: (emoji) ->
     frequently_used_emojis = @getFrequentlyUsedEmojis()
     frequently_used_emojis.push(emoji)

app/assets/stylesheets/pages/search.scss

@@ -159,7 +159,7 @@
 
   &.has-location-badge {
     .search-input-wrap {
-      width: 78%;
+      width: 68%;
     }
   }
 }

app/views/votes/_votes_block.html.haml

@@ -19,12 +19,12 @@
     var post_emoji_url = "#{award_toggle_namespace_project_notes_path(@project.namespace, @project)}";
     var noteable_type = "#{votable.class.name.underscore}";
     var noteable_id = "#{votable.id}";
-    var aliases = #{AwardEmoji.aliases.to_json};
+    var unicodes = #{AwardEmoji.unicode.to_json};
 
     window.awards_handler = new AwardsHandler(
       get_emojis_url,
       post_emoji_url,
       noteable_type,
       noteable_id,
-      aliases
+      unicodes
     );

lib/award_emoji.rb

@@ -52,6 +52,10 @@ class AwardEmoji
     end
   end
 
+  def self.unicode
+    @unicode ||= emojis.map {|key, value| { key => emojis[key]["unicode"] } }.inject(:merge!)
+  end
+
   def self.aliases
     @aliases ||= begin
       json_path = File.join(Rails.root, 'fixtures', 'emojis', 'aliases.json' )