From ab79c76d0c73c282d519b9bc09956dd494ea2bff Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 5 Apr 2017 10:56:40 +0100
Subject: Removes the duplicated search icon in emoji menu

The search emojis title had the same class as the search input which
caused a duplicated icon.

Closes #30416
---
 app/assets/javascripts/awards_handler.js                    | 4 ++--
 changelogs/unreleased/emoji-menu-duplicated-search-icon.yml | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/unreleased/emoji-menu-duplicated-search-icon.yml

diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js
index c743dd551d7..4f63c7988f5 100644
--- a/app/assets/javascripts/awards_handler.js
+++ b/app/assets/javascripts/awards_handler.js
@@ -476,10 +476,10 @@ AwardsHandler.prototype.setupSearch = function setupSearch() {
   this.registerEventListener('on', $('input.emoji-search'), 'input', (e) => {
     const term = $(e.target).val().trim();
     // Clean previous search results
-    $('ul.emoji-menu-search, h5.emoji-search').remove();
+    $('ul.emoji-menu-search, h5.emoji-search-title').remove();
     if (term.length > 0) {
       // Generate a search result block
-      const h5 = $('<h5 class="emoji-search" />').text('Search results');
+      const h5 = $('<h5 class="emoji-search-title"/>').text('Search results');
       const foundEmojis = this.searchEmojis(term).show();
       const ul = $('<ul>').addClass('emoji-menu-list emoji-menu-search').append(foundEmojis);
       $('.emoji-menu-content ul, .emoji-menu-content h5').hide();
diff --git a/changelogs/unreleased/emoji-menu-duplicated-search-icon.yml b/changelogs/unreleased/emoji-menu-duplicated-search-icon.yml
new file mode 100644
index 00000000000..4ab6ba5399c
--- /dev/null
+++ b/changelogs/unreleased/emoji-menu-duplicated-search-icon.yml
@@ -0,0 +1,4 @@
+---
+title: Removed the duplicated search icon in the award emoji menu
+merge_request:
+author:
-- 
cgit v1.2.1