diff options
| author | Valery Sizov <valery@gitlab.com> | 2016-02-15 08:12:17 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2016-02-15 08:12:17 +0000 |
| commit | e654e68c3fb32124189a205207f9d4d59708045d (patch) | |
| tree | bfb08c7e81840a104a880626a606f6a3adaddc3e /app | |
| parent | dc3ea7eb74463c4d6576a96dc0eabd67024bd9c7 (diff) | |
| parent | 46d35cdbe572e7cad434ed9c61fc264160184aba (diff) | |
| download | gitlab-ce-e654e68c3fb32124189a205207f9d4d59708045d.tar.gz | |
Merge branch 'fix-me-me-me-me' into 'master'
Fix duplicate "me" in tooltip of the "thumbsup" awards Emoji
Steps to reproduce:
1. Go to a MR or issue
2. Click on "thumbsup" Emoji 3 times
3. Observe the tooltip becomes "me, me"
Closes #13374, #12788
See merge request !2804
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/awards_handler.coffee | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee index 047df4786a9..360acb864f6 100644 --- a/app/assets/javascripts/awards_handler.coffee +++ b/app/assets/javascripts/awards_handler.coffee @@ -49,10 +49,11 @@ class @AwardsHandler counter.text(parseInt(counter.text()) - 1) emojiIcon.removeClass("active") @removeMeFromAuthorList(emoji) - else if emoji =="thumbsup" || emoji == "thumbsdown" + else if emoji == "thumbsup" || emoji == "thumbsdown" emojiIcon.tooltip("destroy") counter.text(0) emojiIcon.removeClass("active") + @removeMeFromAuthorList(emoji) else emojiIcon.tooltip("destroy") emojiIcon.remove() |