Commit ec81a1c8 authored by Adam Hegyi's avatar Adam Hegyi

Fix invisible modal on status emoji selection

This change fixes a bug where the status emoji is not visible after the
second click on the emoji selector icon.
parent ff596a68
...@@ -82,7 +82,8 @@ export default { ...@@ -82,7 +82,8 @@ export default {
}) })
.catch(() => createFlash(__('Failed to load emoji list.'))); .catch(() => createFlash(__('Failed to load emoji list.')));
}, },
showEmojiMenu() { showEmojiMenu(e) {
e.stopPropagation();
this.isEmojiMenuVisible = true; this.isEmojiMenuVisible = true;
this.emojiMenu.showEmojiMenu($(this.$refs.toggleEmojiMenuButton)); this.emojiMenu.showEmojiMenu($(this.$refs.toggleEmojiMenuButton));
}, },
......
---
title: Fix invisible emoji modal on Set Status form when clicked the second time
merge_request: 33398
author:
type: fixed
...@@ -245,6 +245,15 @@ describe 'User edit profile' do ...@@ -245,6 +245,15 @@ describe 'User edit profile' do
end end
end end
it 'opens the emoji modal again after closing it' do
open_user_status_modal
select_emoji('biohazard', true)
find('.js-toggle-emoji-menu').click
expect(page).to have_selector('.emoji-menu')
end
it 'does not update the awards panel emoji' do it 'does not update the awards panel emoji' do
project.add_maintainer(user) project.add_maintainer(user)
visit(project_issue_path(project, issue)) visit(project_issue_path(project, issue))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment