summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/awards_handler.js
diff options
context:
space:
mode:
authorJared Deckard <jared.deckard@gmail.com>2018-02-06 15:41:41 -0600
committerJared Deckard <jared.deckard@gmail.com>2018-02-07 08:28:16 -0600
commit37a396560cc5b78f39308b03b34ae734cc5fcefc (patch)
tree374eb85729491ee22d41a33907915dbe87278fa5 /app/assets/javascripts/awards_handler.js
parent3647fe58c1069909e2ce610ff85910b74f89ff31 (diff)
downloadgitlab-ce-37a396560cc5b78f39308b03b34ae734cc5fcefc.tar.gz
Don't reset the awards block when the emoji search is clicked
Diffstat (limited to 'app/assets/javascripts/awards_handler.js')
-rw-r--r--app/assets/javascripts/awards_handler.js4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js
index 87109a802e5..3283ce5ec36 100644
--- a/app/assets/javascripts/awards_handler.js
+++ b/app/assets/javascripts/awards_handler.js
@@ -50,10 +50,8 @@ class AwardsHandler {
this.registerEventListener('on', $('html'), 'click', (e) => {
const $target = $(e.target);
- if (!$target.closest('.emoji-menu-content').length) {
- $('.js-awards-block.current').removeClass('current');
- }
if (!$target.closest('.emoji-menu').length) {
+ $('.js-awards-block.current').removeClass('current');
if ($('.emoji-menu').is(':visible')) {
$('.js-add-award.is-active').removeClass('is-active');
this.hideMenuElement($('.emoji-menu'));