diff options
| author | Felipe Artur <felipefac@gmail.com> | 2016-06-29 11:31:50 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2016-06-29 11:32:38 -0300 |
| commit | d2971315abd0e6e94860505e50ec71082c3679da (patch) | |
| tree | 0f3dcf23406ec9fb3d6362b7f746e978ace692b3 /app/assets/javascripts/awards_handler.coffee | |
| parent | 36d48120f66d52dcc8697893ca1ab85322ba7c8b (diff) | |
| parent | bef4294c58e0bbadc01f633fc8bea514801de7ae (diff) | |
| download | gitlab-ce-issue_3359_3.tar.gz | |
Merge branch 'master' into issue_3359_3issue_3359_3
Diffstat (limited to 'app/assets/javascripts/awards_handler.coffee')
| -rw-r--r-- | app/assets/javascripts/awards_handler.coffee | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee index 030f1564862..37d0adaa625 100644 --- a/app/assets/javascripts/awards_handler.coffee +++ b/app/assets/javascripts/awards_handler.coffee @@ -341,7 +341,9 @@ class @AwardsHandler for emoji in frequentlyUsedEmojis $(".emoji-menu-content [data-emoji='#{emoji}']").closest('li').clone().appendTo(ul) - $('input.emoji-search').after(ul).after($('<h5>').text('Frequently used')) + $('.emoji-menu-content') + .prepend(ul) + .prepend($('<h5>').text('Frequently used')) @frequentEmojiBlockRendered = true @@ -356,7 +358,7 @@ class @AwardsHandler if term # Generate a search result block - h5 = $('<h5>').text('Search results').addClass('emoji-search') + h5 = $('<h5>').text('Search results') found_emojis = @searchEmojis(term).show() ul = $('<ul>').addClass('emoji-menu-list emoji-menu-search').append(found_emojis) $('.emoji-menu-content ul, .emoji-menu-content h5').hide() |