Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
428b220a
Commit
428b220a
authored
Nov 15, 2018
by
Hiroyuki Sato
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix not render emoji in filter dropdown
parent
7528b2d2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
4 deletions
+12
-4
app/assets/javascripts/filtered_search/dropdown_emoji.js
app/assets/javascripts/filtered_search/dropdown_emoji.js
+7
-4
changelogs/unreleased/fix-not-render-emoji.yml
changelogs/unreleased/fix-not-render-emoji.yml
+5
-0
No files found.
app/assets/javascripts/filtered_search/dropdown_emoji.js
View file @
428b220a
...
@@ -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
'
);
const
emojiTag
=
this
.
glEmojiTag
(
name
);
if
(
valueElement
!==
null
)
{
const
emojiElement
=
dropdownItem
.
querySelector
(
'
gl-emoji
'
);
const
name
=
valueElement
.
innerText
;
emojiElement
.
outerHTML
=
emojiTag
;
const
emojiTag
=
this
.
glEmojiTag
(
name
);
const
emojiElement
=
dropdownItem
.
querySelector
(
'
gl-emoji
'
);
emojiElement
.
outerHTML
=
emojiTag
;
}
});
});
}
}
...
...
changelogs/unreleased/fix-not-render-emoji.yml
0 → 100644
View file @
428b220a
---
title
:
Fix not render emoji in filter dropdown
merge_request
:
23112
author
:
Hiroyuki Sato
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment