diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-11-19 07:00:49 +0000 |
---|---|---|
committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2018-11-30 03:56:18 +0000 |
commit | 05472a43102c8cb52abce11f16584f9f6fd756d7 (patch) | |
tree | c01e44149fd76d591ccf9298c9f458deac65485b | |
parent | 2de43a823333d04ac3c4da48a9716759fa9e6c5f (diff) | |
download | gitlab-ce-05472a43102c8cb52abce11f16584f9f6fd756d7.tar.gz |
Merge branch 'fix-not-render-emoji' into 'master'
Fix not render emoji in filter dropdown
See merge request gitlab-org/gitlab-ce!23112
(cherry picked from commit 8dd89f03061aa646bcda5055fa96376fb9e30759)
428b220a Fix not render emoji in filter dropdown
59e5bad1 Fix spec to catch not rendering emoji
-rw-r--r-- | app/assets/javascripts/filtered_search/dropdown_emoji.js | 11 | ||||
-rw-r--r-- | changelogs/unreleased/fix-not-render-emoji.yml | 5 | ||||
-rw-r--r-- | spec/features/issues/filtered_search/dropdown_emoji_spec.rb | 2 |
3 files changed, 13 insertions, 5 deletions
diff --git a/app/assets/javascripts/filtered_search/dropdown_emoji.js b/app/assets/javascripts/filtered_search/dropdown_emoji.js index af7936a92fb..d9a4d06b549 100644 --- a/app/assets/javascripts/filtered_search/dropdown_emoji.js +++ b/app/assets/javascripts/filtered_search/dropdown_emoji.js @@ -69,10 +69,13 @@ export default class DropdownEmoji extends FilteredSearchDropdown { // Replace empty gl-emoji tag to real content const dropdownItems = [...this.dropdown.querySelectorAll('.filter-dropdown-item')]; dropdownItems.forEach(dropdownItem => { - const name = dropdownItem.querySelector('.js-data-value').innerText; - const emojiTag = this.glEmojiTag(name); - const emojiElement = dropdownItem.querySelector('gl-emoji'); - emojiElement.outerHTML = emojiTag; + const valueElement = dropdownItem.querySelector('.js-data-value'); + if (valueElement !== null) { + const name = valueElement.innerText; + const emojiTag = this.glEmojiTag(name); + const emojiElement = dropdownItem.querySelector('gl-emoji'); + emojiElement.outerHTML = emojiTag; + } }); } diff --git a/changelogs/unreleased/fix-not-render-emoji.yml b/changelogs/unreleased/fix-not-render-emoji.yml new file mode 100644 index 00000000000..857b97004f0 --- /dev/null +++ b/changelogs/unreleased/fix-not-render-emoji.yml @@ -0,0 +1,5 @@ +--- +title: Fix not render emoji in filter dropdown +merge_request: 23112 +author: Hiroyuki Sato +type: fixed diff --git a/spec/features/issues/filtered_search/dropdown_emoji_spec.rb b/spec/features/issues/filtered_search/dropdown_emoji_spec.rb index c42fcd92a36..97dd0afd002 100644 --- a/spec/features/issues/filtered_search/dropdown_emoji_spec.rb +++ b/spec/features/issues/filtered_search/dropdown_emoji_spec.rb @@ -20,7 +20,7 @@ describe 'Dropdown emoji', :js do end def dropdown_emoji_size - page.all('#js-dropdown-my-reaction .filter-dropdown .filter-dropdown-item').size + all('gl-emoji[data-name]').size end def click_emoji(text) |