BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
ab79c76d
Commit
ab79c76d
authored
Apr 05, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removes the duplicated search icon in emoji menu
The search emojis title had the same class as the search input which caused a duplicated icon. Closes #30416
parent
65ea732c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
awards_handler.js
app/assets/javascripts/awards_handler.js
+2
-2
emoji-menu-duplicated-search-icon.yml
changelogs/unreleased/emoji-menu-duplicated-search-icon.yml
+4
-0
No files found.
app/assets/javascripts/awards_handler.js
View file @
ab79c76d
...
...
@@ -476,10 +476,10 @@ AwardsHandler.prototype.setupSearch = function setupSearch() {
this
.
registerEventListener
(
'on'
,
$
(
'input.emoji-search'
),
'input'
,
(
e
)
=>
{
const
term
=
$
(
e
.
target
).
val
().
trim
();
// Clean previous search results
$
(
'ul.emoji-menu-search, h5.emoji-search'
).
remove
();
$
(
'ul.emoji-menu-search, h5.emoji-search
-title
'
).
remove
();
if
(
term
.
length
>
0
)
{
// Generate a search result block
const
h5
=
$
(
'<h5 class="emoji-search
"
/>'
).
text
(
'Search results'
);
const
h5
=
$
(
'<h5 class="emoji-search
-title"
/>'
).
text
(
'Search results'
);
const
foundEmojis
=
this
.
searchEmojis
(
term
).
show
();
const
ul
=
$
(
'<ul>'
).
addClass
(
'emoji-menu-list emoji-menu-search'
).
append
(
foundEmojis
);
$
(
'.emoji-menu-content ul, .emoji-menu-content h5'
).
hide
();
...
...
changelogs/unreleased/emoji-menu-duplicated-search-icon.yml
0 → 100644
View file @
ab79c76d
---
title
:
Removed the duplicated search icon in the award emoji menu
merge_request
:
author
:
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