Commit 8dd89f03 authored by Mike Greiling's avatar Mike Greiling

Merge branch 'fix-not-render-emoji' into 'master'

Fix not render emoji in filter dropdown

See merge request gitlab-org/gitlab-ce!23112
parents 4693cebb 59e5bad1
...@@ -69,10 +69,13 @@ export default class DropdownEmoji extends FilteredSearchDropdown { ...@@ -69,10 +69,13 @@ export default class DropdownEmoji extends FilteredSearchDropdown {
// Replace empty gl-emoji tag to real content // Replace empty gl-emoji tag to real content
const dropdownItems = [...this.dropdown.querySelectorAll('.filter-dropdown-item')]; const dropdownItems = [...this.dropdown.querySelectorAll('.filter-dropdown-item')];
dropdownItems.forEach(dropdownItem => { dropdownItems.forEach(dropdownItem => {
const name = dropdownItem.querySelector('.js-data-value').innerText; const valueElement = dropdownItem.querySelector('.js-data-value');
if (valueElement !== null) {
const name = valueElement.innerText;
const emojiTag = this.glEmojiTag(name); const emojiTag = this.glEmojiTag(name);
const emojiElement = dropdownItem.querySelector('gl-emoji'); const emojiElement = dropdownItem.querySelector('gl-emoji');
emojiElement.outerHTML = emojiTag; emojiElement.outerHTML = emojiTag;
}
}); });
} }
......
---
title: Fix not render emoji in filter dropdown
merge_request: 23112
author: Hiroyuki Sato
type: fixed
...@@ -20,7 +20,7 @@ describe 'Dropdown emoji', :js do ...@@ -20,7 +20,7 @@ describe 'Dropdown emoji', :js do
end end
def dropdown_emoji_size def dropdown_emoji_size
page.all('#js-dropdown-my-reaction .filter-dropdown .filter-dropdown-item').size all('gl-emoji[data-name]').size
end end
def click_emoji(text) def click_emoji(text)
......
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