diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-12-24 15:44:43 +0200 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-12-24 15:44:43 +0200 |
| commit | a55b653d938e5ca5464c48174da3adce84cab275 (patch) | |
| tree | 5f4c6516a63d0dae1547d67e5c125ed15bca71ae | |
| parent | 5ed1256492fa9edaf03a07d8c9360bac32082498 (diff) | |
| download | gitlab-ce-a55b653d938e5ca5464c48174da3adce84cab275.tar.gz | |
fix of frequently used emojis
| -rw-r--r-- | app/assets/javascripts/awards_handler.coffee | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee index 93860e3bbf3..bb17427852d 100644 --- a/app/assets/javascripts/awards_handler.coffee +++ b/app/assets/javascripts/awards_handler.coffee @@ -137,9 +137,9 @@ class @AwardsHandler for emoji in frequently_used_emojis do (emoji) -> - $(".emoji-menu-content [data-emoji='" + emoji + "']").closest("li").clone().appendTo(ul) + $(".emoji-menu-content [data-emoji='#{emoji}']").closest("li").clone().appendTo(ul) - $(".emoji-menu-content").prepend(ul).prepend($("<h4>").text("Frequently used")) + $("input.emoji-search").after(ul).after($("<h5>").text("Frequently used")) setupSearch: -> $("input.emoji-search").keyup (ev) => @@ -149,7 +149,7 @@ class @AwardsHandler $("ul.emoji-search,h5.emoji-search").remove() if term - # Generate search result block + # Generate a search result block h5 = $("<h5>").text("Search results").addClass("emoji-search") found_emojis = @searchEmojis(term).show() ul = $("<ul>").addClass("emoji-search").append(found_emojis) |