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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
56046ca8
Commit
56046ca8
authored
Aug 01, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'search-flickering' into 'master'
Fixes the search losing focus Closes #35515 See merge request !13221
parents
4c77c30f
fe555e86
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
app/assets/javascripts/gl_dropdown.js
app/assets/javascripts/gl_dropdown.js
+3
-3
changelogs/unreleased/search-flickering.yml
changelogs/unreleased/search-flickering.yml
+4
-0
No files found.
app/assets/javascripts/gl_dropdown.js
View file @
56046ca8
...
@@ -730,10 +730,10 @@ GitLabDropdown = (function() {
...
@@ -730,10 +730,10 @@ GitLabDropdown = (function() {
GitLabDropdown
.
prototype
.
focusTextInput
=
function
(
triggerFocus
=
false
)
{
GitLabDropdown
.
prototype
.
focusTextInput
=
function
(
triggerFocus
=
false
)
{
if
(
this
.
options
.
filterable
)
{
if
(
this
.
options
.
filterable
)
{
$
(
'
:focus
'
).
blur
();
this
.
dropdown
.
one
(
'
transitionend
'
,
()
=>
{
this
.
dropdown
.
one
(
'
transitionend
'
,
()
=>
{
this
.
filterInput
.
focus
();
if
(
this
.
dropdown
.
is
(
'
.open
'
))
{
this
.
filterInput
.
focus
();
}
});
});
if
(
triggerFocus
)
{
if
(
triggerFocus
)
{
...
...
changelogs/unreleased/search-flickering.yml
0 → 100644
View file @
56046ca8
---
title
:
Fix search box losing focus when typing
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