Commit 2541f592 authored by Alfredo Sumaran's avatar Alfredo Sumaran Committed by Jacob Schatz

Better wording

parent ec0dfff2
...@@ -84,14 +84,14 @@ class @SearchAutocomplete ...@@ -84,14 +84,14 @@ class @SearchAutocomplete
if event.keyCode is @keyCode.ENTER if event.keyCode is @keyCode.ENTER
@goToResult(ui.item) @goToResult(ui.item)
else else
# Pressing tab sets the scope # Pressing tab sets the location
if event.keyCode is @keyCode.TAB and ui.item.scope? if event.keyCode is @keyCode.TAB and ui.item.location?
@setLocationBadge(ui.item) @setLocationBadge(ui.item)
@searchInput @searchInput
.val('') # remove selected value from input .val('') # remove selected value from input
.focus() .focus()
else else
# If option is not a scope go to page # If option is not a location go to page
@goToResult(ui.item) @goToResult(ui.item)
# Return false to avoid focus on the next element # Return false to avoid focus on the next element
...@@ -153,7 +153,7 @@ class @SearchAutocomplete ...@@ -153,7 +153,7 @@ class @SearchAutocomplete
# Reset input states # Reset input states
@resetSearchState() @resetSearchState()
switch item.scope switch item.location
when 'projects' when 'projects'
@projectInputEl.val(item.id) @projectInputEl.val(item.id)
# @searchCodeInputEl.val('true') # TODO: always true for projects? # @searchCodeInputEl.val('true') # TODO: always true for projects?
......
...@@ -72,7 +72,7 @@ module SearchHelper ...@@ -72,7 +72,7 @@ module SearchHelper
current_user.authorized_groups.search(term).limit(limit).map do |group| current_user.authorized_groups.search(term).limit(limit).map do |group|
{ {
category: "Groups", category: "Groups",
scope: "groups", location: "groups",
id: group.id, id: group.id,
label: "#{search_result_sanitize(group.name)}", label: "#{search_result_sanitize(group.name)}",
url: group_path(group) url: group_path(group)
...@@ -86,7 +86,7 @@ module SearchHelper ...@@ -86,7 +86,7 @@ module SearchHelper
sorted_by_stars.non_archived.limit(limit).map do |p| sorted_by_stars.non_archived.limit(limit).map do |p|
{ {
category: "Projects", category: "Projects",
scope: "projects", location: "projects",
id: p.id, id: p.id,
value: "#{search_result_sanitize(p.name)}", value: "#{search_result_sanitize(p.name)}",
label: "#{search_result_sanitize(p.name_with_namespace)}", label: "#{search_result_sanitize(p.name_with_namespace)}",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment