diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-01-18 18:28:39 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-01-18 18:28:39 +0000 |
| commit | 21ac92b8ba53ba90ccb03b2406435c6cb11b567d (patch) | |
| tree | 8b665a7a8df9297b6e6d3276f06d339c9b618a23 | |
| parent | 9f03ae8c91e2026c65346ab68c3cd737ab2e3c94 (diff) | |
| parent | 182cc843b02a6773b8650b4e0f2e42a099bef0bd (diff) | |
| download | gitlab-ce-21ac92b8ba53ba90ccb03b2406435c6cb11b567d.tar.gz | |
Merge branch 'remove-leading-comma-award-emoji' into 'master'
Remove leading comma when user is the only one to award that emoji
Fixes #9073
See merge request !2450
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/awards_handler.coffee | 13 |
2 files changed, 10 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG index 96da0cde9e3..9c242cb44a8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -61,6 +61,7 @@ v 8.4.0 (unreleased) - Import GitHub wiki into GitLab - Add reporters ability to download and browse build artifacts (Andrew Johnson) - Autofill referring url in message box when reporting user abuse. (Josh Frye) + - Remove leading comma on award emoji when the user is the first to award the emoji (Zeger-Jan van de Weg) v 8.3.4 - Use gitlab-workhorse 0.5.4 (fixes API routing bug) diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee index 4670c95344d..9d5ae6c04e9 100644 --- a/app/assets/javascripts/awards_handler.coffee +++ b/app/assets/javascripts/awards_handler.coffee @@ -19,7 +19,7 @@ class @AwardsHandler @addAwardToEmojiBar(emoji) $(".emoji-menu").hide() - + addAwardToEmojiBar: (emoji) -> @addEmojiToFrequentlyUsedList(emoji) @@ -66,9 +66,14 @@ class @AwardsHandler addMeToAuthorList: (emoji) -> award_block = @findEmojiIcon(emoji).parent() - authors = award_block.attr("data-original-title").split(", ") + authors = _.compact(award_block.attr("data-original-title").split(", ")) authors.push("me") - award_block.attr("title", authors.join(", ")) + + if authors.length == 1 + award_block.attr("title", "me") + else + award_block.attr("title", authors.join(", ")) + @resetTooltip(award_block) resetTooltip: (award) -> @@ -78,7 +83,7 @@ class @AwardsHandler setTimeout (-> award.tooltip() ), 200 - + createEmoji: (emoji) -> emojiCssClass = @resolveNameToCssClass(emoji) |