diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-06-09 23:15:50 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-06-09 23:50:06 +0300 |
| commit | e885c2fd314bf1d4bc5943f68170150e92d756f4 (patch) | |
| tree | 428ac727e01e70e858c34441fcd30f7e964bdfcf | |
| parent | c9878373361676e8103576008dead63369d951e5 (diff) | |
| download | gitlab-ce-award-emoji-fixes.tar.gz | |
Ignore frequent emojis in search.award-emoji-fixes
| -rw-r--r-- | app/assets/javascripts/awards_handler.coffee | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee index 58fd8f05902..ddbce1f532c 100644 --- a/app/assets/javascripts/awards_handler.coffee +++ b/app/assets/javascripts/awards_handler.coffee @@ -336,7 +336,7 @@ class @AwardsHandler if $.cookie 'frequently_used_emojis' frequentlyUsedEmojis = @getFrequentlyUsedEmojis() - ul = $("<ul class='clearfix emoji-menu-list'>") + ul = $("<ul class='clearfix emoji-menu-list frequent'>") for emoji in frequentlyUsedEmojis $(".emoji-menu-content [data-emoji='#{emoji}']").closest('li').clone().appendTo(ul) @@ -367,4 +367,4 @@ class @AwardsHandler searchEmojis: (term) -> - $(".emoji-menu-content [data-emoji*='#{term}']").closest('li').clone() + $(".emoji-menu-list:not(.frequent) [data-emoji*='#{term}']").closest('li').clone() |