diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-02-15 08:16:53 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2018-02-15 08:16:53 +0000 |
| commit | e78d358bdc50298f61f4730b7224e77b2438a870 (patch) | |
| tree | 81222a95353dd21c2201eb861e825563760ad3ff | |
| parent | e9802a833c1741990c13ced6288cdcefb194b17e (diff) | |
| parent | 85c93d896495045e54a89461156daa9ec0c2c071 (diff) | |
| download | gitlab-ce-e78d358bdc50298f61f4730b7224e77b2438a870.tar.gz | |
Merge branch '35530-teleporting-emoji-fix' into 'master'
Fix teleporting emoji (MR description instead of comment)
Closes #35530
See merge request gitlab-org/gitlab-ce!17100
| -rw-r--r-- | app/assets/javascripts/awards_handler.js | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/35530-teleporting-emoji.yml | 5 | ||||
| -rw-r--r-- | spec/javascripts/awards_handler_spec.js | 13 |
3 files changed, 18 insertions, 4 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')); diff --git a/changelogs/unreleased/35530-teleporting-emoji.yml b/changelogs/unreleased/35530-teleporting-emoji.yml new file mode 100644 index 00000000000..a60a42b9e48 --- /dev/null +++ b/changelogs/unreleased/35530-teleporting-emoji.yml @@ -0,0 +1,5 @@ +--- +title: Fix Teleporting Emoji +merge_request: 16963 +author: Jared Deckard <jared.deckard@gmail.com> +type: fixed diff --git a/spec/javascripts/awards_handler_spec.js b/spec/javascripts/awards_handler_spec.js index 268b5b83b73..1c1b3f3ced3 100644 --- a/spec/javascripts/awards_handler_spec.js +++ b/spec/javascripts/awards_handler_spec.js @@ -79,7 +79,7 @@ import '~/lib/utils/common_utils'; return expect($emojiMenu.length).toBe(1); }); }); - return it('should remove emoji menu when body is clicked', function(done) { + it('should remove emoji menu when body is clicked', function(done) { $('.js-add-award').eq(0).click(); return lazyAssert(done, function() { var $emojiMenu; @@ -90,6 +90,17 @@ import '~/lib/utils/common_utils'; return expect($('.js-awards-block.current').length).toBe(0); }); }); + it('should not remove emoji menu when search is clicked', function(done) { + $('.js-add-award').eq(0).click(); + return lazyAssert(done, function() { + var $emojiMenu; + $emojiMenu = $('.emoji-menu'); + $('.emoji-search').click(); + expect($emojiMenu.length).toBe(1); + expect($emojiMenu.hasClass('is-visible')).toBe(true); + return expect($('.js-awards-block.current').length).toBe(1); + }); + }); }); describe('::addAwardToEmojiBar', function() { it('should add emoji to votes block', function() { |