diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-12-11 13:10:00 +0200 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-12-11 13:17:12 +0200 |
| commit | 72b7d1f59d4fb26fb9119c5a059528f0fc951904 (patch) | |
| tree | 18faa50e9d67746be474577f395c720ff49df81b /app | |
| parent | cd97dba2a9a26e83818f7e111bc0b0185a7ced8a (diff) | |
| download | gitlab-ce-72b7d1f59d4fb26fb9119c5a059528f0fc951904.tar.gz | |
emoji aliases problem
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/awards_handler.coffee | 7 | ||||
| -rw-r--r-- | app/models/note.rb | 3 | ||||
| -rw-r--r-- | app/views/votes/_votes_block.html.haml | 3 |
3 files changed, 10 insertions, 3 deletions
diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee index 96fd8f8773e..3ff9ba77dfc 100644 --- a/app/assets/javascripts/awards_handler.coffee +++ b/app/assets/javascripts/awards_handler.coffee @@ -1,11 +1,13 @@ class @AwardsHandler - constructor: (@post_emoji_url, @noteable_type, @noteable_id) -> + constructor: (@post_emoji_url, @noteable_type, @noteable_id, @aliases) -> addAward: (emoji) -> + emoji = @normilizeEmojiName(emoji) @postEmoji emoji, => @addAwardToEmojiBar(emoji) addAwardToEmojiBar: (emoji, custom_path = '') -> + emoji = @normilizeEmojiName(emoji) if @exist(emoji) if @isActive(emoji) @decrementCounter(emoji) @@ -94,3 +96,6 @@ class @AwardsHandler $('body, html').animate({ scrollTop: $('.awards').offset().top - 80 }, 200) + + normilizeEmojiName: (emoji) -> + @aliases[emoji] || emoji diff --git a/app/models/note.rb b/app/models/note.rb index 8f0efa8d4b7..04053ccc61e 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -377,6 +377,7 @@ class Note < ActiveRecord::Base end def award_emoji_name - note.match(Gitlab::Markdown::EmojiFilter.emoji_pattern)[1] + original_name = note.match(Gitlab::Markdown::EmojiFilter.emoji_pattern)[1] + AwardEmoji.normilize_emoji_name(original_name) end end diff --git a/app/views/votes/_votes_block.html.haml b/app/views/votes/_votes_block.html.haml index 7eb27c12d33..6071f1484c6 100644 --- a/app/views/votes/_votes_block.html.haml +++ b/app/views/votes/_votes_block.html.haml @@ -19,7 +19,8 @@ post_emoji_url = "#{award_toggle_namespace_project_notes_path(@project.namespace, @project)}" noteable_type = "#{votable.class.name.underscore}" noteable_id = "#{votable.id}" - window.awards_handler = new AwardsHandler(post_emoji_url, noteable_type, noteable_id) + aliases = #{AwardEmoji::ALIASES.to_json} + window.awards_handler = new AwardsHandler(post_emoji_url, noteable_type, noteable_id, aliases) $(".awards-menu li").click (e)-> emoji = $(this).data("emoji") |