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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
fd31eeab
Commit
fd31eeab
authored
May 22, 2017
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix eslint
parent
e723b921
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
app/assets/javascripts/filtered_search/dropdown_utils.js
app/assets/javascripts/filtered_search/dropdown_utils.js
+2
-1
app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
...ripts/filtered_search/filtered_search_dropdown_manager.js
+4
-2
No files found.
app/assets/javascripts/filtered_search/dropdown_utils.js
View file @
fd31eeab
...
...
@@ -54,7 +54,8 @@ class DropdownUtils {
const
{
input
,
allowedKeys
}
=
options
;
const
updatedItem
=
item
;
const
searchInput
=
gl
.
DropdownUtils
.
getSearchQuery
(
input
);
const
{
lastToken
,
tokens
}
=
gl
.
FilteredSearchTokenizer
.
processTokens
(
searchInput
,
allowedKeys
);
const
{
lastToken
,
tokens
}
=
gl
.
FilteredSearchTokenizer
.
processTokens
(
searchInput
,
allowedKeys
);
const
lastKey
=
lastToken
.
key
||
lastToken
||
''
;
const
allowMultiple
=
item
.
type
===
'
array
'
;
const
itemInExistingTokens
=
tokens
.
some
(
t
=>
t
.
key
===
item
.
hint
);
...
...
app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
View file @
fd31eeab
...
...
@@ -110,7 +110,8 @@ class FilteredSearchDropdownManager {
if
(
!
mappingKey
.
reference
)
{
const
dl
=
this
.
droplab
;
const
defaultArguments
=
[
null
,
dl
,
element
,
this
.
filteredSearchInput
,
this
.
filteredSearchTokenKeys
,
key
];
const
defaultArguments
=
[
null
,
dl
,
element
,
this
.
filteredSearchInput
,
this
.
filteredSearchTokenKeys
,
key
];
const
glArguments
=
defaultArguments
.
concat
(
mappingKey
.
extraArguments
||
[]);
// Passing glArguments to `new gl[glClass](<arguments>)`
...
...
@@ -153,7 +154,8 @@ class FilteredSearchDropdownManager {
setDropdown
()
{
const
query
=
gl
.
DropdownUtils
.
getSearchQuery
(
true
);
const
{
lastToken
,
searchToken
}
=
this
.
tokenizer
.
processTokens
(
query
,
this
.
filteredSearchTokenKeys
.
getKeys
());
const
{
lastToken
,
searchToken
}
=
this
.
tokenizer
.
processTokens
(
query
,
this
.
filteredSearchTokenKeys
.
getKeys
());
if
(
this
.
currentDropdown
)
{
this
.
updateCurrentDropdownOffset
();
...
...
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