diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-02-12 17:41:52 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-02-13 02:02:05 -0800 |
| commit | 7ffcc5a17bc462b652e91c1cff36b8baaeb6a41a (patch) | |
| tree | c3ed7f62c0c3ec5996bf2968983cabd1bc9c04f2 | |
| parent | 0f2dc6a7d7c30b84fb241baa592c37e7c5f49e48 (diff) | |
| download | gitlab-ce-7ffcc5a17bc462b652e91c1cff36b8baaeb6a41a.tar.gz | |
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
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/awards_handler.coffee | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 9b2d6d58a5c..a3ceca34b07 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.5.0 (unreleased) + - Fix duplicate "me" in tooltip of the "thumbsup" awards Emoji (Stan Hu) - Cache various Repository methods to improve performance (Yorick Peterse) - Fix duplicated branch creation/deletion Web hooks/service notifications when using Web UI (Stan Hu) - Ensure rake tasks that don't need a DB connection can be run without one 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() |