diff options
| author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-09-23 15:53:53 +0100 |
|---|---|---|
| committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-09-24 20:14:22 +0100 |
| commit | 6c8f32a03b61c794a891111f591084f0a6392be3 (patch) | |
| tree | 16d3fd7154c4302a8cf435907f04c2eb7755a433 | |
| parent | 6602b917f7ffcb8c8e9134ee156ac49c24ed2a9b (diff) | |
| download | gitlab-ce-22525-emoji-dropdown-shows-search-results-label-several-times.tar.gz | |
Added `@zeiv`s changes to fix awards search, including CHANGELOG where he is credited22525-emoji-dropdown-shows-search-results-label-several-times
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/awards_handler.js | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 592a3fec134..1ba2b4eddc7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -8,6 +8,7 @@ v 8.12.2 (unreleased) v 8.12.1 - Fix a memory leak in HTML::Pipeline::SanitizationFilter::WHITELIST - Fix issue with search filter labels not displaying + - Fix bug where 'Search results' repeated many times when a search in the emoji search form is cleared (Xavier Bick) (@zeiv) v 8.12.0 - Update the rouge gem to 2.0.6, which adds highlighting support for JSX, Prometheus, and others. !6251 diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js index 0decc6d09e6..979b0c68cb3 100644 --- a/app/assets/javascripts/awards_handler.js +++ b/app/assets/javascripts/awards_handler.js @@ -357,7 +357,7 @@ $('ul.emoji-menu-search, h5.emoji-search').remove(); if (term) { // Generate a search result block - h5 = $('<h5>').text('Search results'); + h5 = $('<h5>').addClass('emoji-search').text('Search results'); found_emojis = _this.searchEmojis(term).show(); ul = $('<ul>').addClass('emoji-menu-list emoji-menu-search').append(found_emojis); $('.emoji-menu-content ul, .emoji-menu-content h5').hide(); |