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
iv
gitlab-ce
Commits
2541f592
Commit
2541f592
authored
8 years ago
by
Alfredo Sumaran
Committed by
Jacob Schatz
8 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Better wording
parent
ec0dfff2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
app/assets/javascripts/search_autocomplete.js.coffee
app/assets/javascripts/search_autocomplete.js.coffee
+4
-4
app/helpers/search_helper.rb
app/helpers/search_helper.rb
+2
-2
No files found.
app/assets/javascripts/search_autocomplete.js.coffee
View file @
2541f592
...
...
@@ -84,14 +84,14 @@ class @SearchAutocomplete
if
event
.
keyCode
is
@
keyCode
.
ENTER
@
goToResult
(
ui
.
item
)
else
# Pressing tab sets the
scope
if
event
.
keyCode
is
@
keyCode
.
TAB
and
ui
.
item
.
scope
?
# Pressing tab sets the
location
if
event
.
keyCode
is
@
keyCode
.
TAB
and
ui
.
item
.
location
?
@
setLocationBadge
(
ui
.
item
)
@
searchInput
.
val
(
''
)
# remove selected value from input
.
focus
()
else
# If option is not a
scope
go to page
# If option is not a
location
go to page
@
goToResult
(
ui
.
item
)
# Return false to avoid focus on the next element
...
...
@@ -153,7 +153,7 @@ class @SearchAutocomplete
# Reset input states
@
resetSearchState
()
switch
item
.
scope
switch
item
.
location
when
'projects'
@
projectInputEl
.
val
(
item
.
id
)
# @searchCodeInputEl.val('true') # TODO: always true for projects?
...
...
This diff is collapsed.
Click to expand it.
app/helpers/search_helper.rb
View file @
2541f592
...
...
@@ -72,7 +72,7 @@ module SearchHelper
current_user
.
authorized_groups
.
search
(
term
).
limit
(
limit
).
map
do
|
group
|
{
category:
"Groups"
,
scope
:
"groups"
,
location
:
"groups"
,
id:
group
.
id
,
label:
"
#{
search_result_sanitize
(
group
.
name
)
}
"
,
url:
group_path
(
group
)
...
...
@@ -86,7 +86,7 @@ module SearchHelper
sorted_by_stars
.
non_archived
.
limit
(
limit
).
map
do
|
p
|
{
category:
"Projects"
,
scope
:
"projects"
,
location
:
"projects"
,
id:
p
.
id
,
value:
"
#{
search_result_sanitize
(
p
.
name
)
}
"
,
label:
"
#{
search_result_sanitize
(
p
.
name_with_namespace
)
}
"
,
...
...
This diff is collapsed.
Click to expand it.
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