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
ee87d15c
Commit
ee87d15c
authored
Apr 05, 2016
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change approach, do not use timeouts
parent
7baebd32
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
20 deletions
+14
-20
search_autocomplete.js.coffee
app/assets/javascripts/search_autocomplete.js.coffee
+12
-18
_search.html.haml
app/views/layouts/_search.html.haml
+2
-2
No files found.
app/assets/javascripts/search_autocomplete.js.coffee
View file @
ee87d15c
...
...
@@ -137,13 +137,17 @@ class @SearchAutocomplete
}
bindEvents
:
->
$
(
document
).
on
'click'
,
@
onDocumentClick
@
searchInput
.
on
'keydown'
,
@
onSearchInputKeyDown
@
searchInput
.
on
'keyup'
,
@
onSearchInputKeyUp
@
searchInput
.
on
'click'
,
@
onSearchInputClick
@
searchInput
.
on
'focus'
,
@
onSearchInputFocus
@
searchInput
.
on
'blur'
,
@
onSearchInputBlur
@
clearInput
.
on
'click'
,
@
onRemoveLocationClick
onDocumentClick
:
(
e
)
=>
if
not
$
.
contains
(
@
dropdown
[
0
],
e
.
target
)
and
@
isFocused
@
onSearchInputBlur
()
enableAutocomplete
:
->
# No need to enable anything if user is not logged in
return
if
!
gon
.
current_user_id
...
...
@@ -193,27 +197,21 @@ class @SearchAutocomplete
e
.
stopImmediatePropagation
()
onSearchInputFocus
:
=>
@
isFocused
=
true
@
wrap
.
addClass
(
'search-active'
)
onRemoveLocationClick
:
(
e
)
=>
e
.
preventDefault
()
@
removeLocationBadge
()
@
searchInput
.
val
(
''
).
focus
()
@
skipBlurEvent
=
true
onSearchInputBlur
:
(
e
)
=>
@
skipBlurEvent
=
false
# We should wait to make sure we are not clearing the input instead
setTimeout
(
=>
return
if
@
skipBlurEvent
@
isFocused
=
false
@
wrap
.
removeClass
(
'search-active'
)
@
wrap
.
removeClass
(
'search-active'
)
# If input is blank then restore state
if
@
searchInput
.
val
()
is
''
@
restoreOriginalState
()
,
150
)
# If input is blank then restore state
if
@
searchInput
.
val
()
is
''
@
restoreOriginalState
()
addLocationBadge
:
(
item
)
->
category
=
if
item
.
category
?
then
"
#{
item
.
category
}
: "
else
''
...
...
@@ -291,9 +289,5 @@ class @SearchAutocomplete
$el
.
removeClass
(
'is-active'
)
@
disableAutocomplete
()
@
onSearchInputFocus
()
@
searchInput
.
val
(
''
).
focus
()
# We need to wait because of @skipBlurEvent
setTimeout
(
=>
@
onSearchInputFocus
()
,
200
)
app/views/layouts/_search.html.haml
View file @
ee87d15c
...
...
@@ -21,8 +21,8 @@
%a
.is-focused.dropdown-menu-empty-link
Loading...
=
dropdown_loading
%i
.search-icon
%i
.clear-icon.js-clear-input
%i
.search-icon
%i
.clear-icon.js-clear-input
=
hidden_field_tag
:group_id
,
@group
.
try
(
:id
)
=
hidden_field_tag
:project_id
,
@project
&&
@project
.
persisted?
?
@project
.
id
:
''
,
id:
'search_project_id'
...
...
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