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
Boxiang Sun
gitlab-ce
Commits
d5ff5410
Commit
d5ff5410
authored
Jun 18, 2019
by
Arun Kumar Mohan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename TOKEN_TYPES to USER_TOKEN_TYPES
parent
b6cc32b0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
app/assets/javascripts/filtered_search/constants.js
app/assets/javascripts/filtered_search/constants.js
+1
-1
app/assets/javascripts/filtered_search/visual_token_value.js
app/assets/javascripts/filtered_search/visual_token_value.js
+2
-2
No files found.
app/assets/javascripts/filtered_search/constants.js
View file @
d5ff5410
/* eslint-disable import/prefer-default-export */
/* eslint-disable import/prefer-default-export */
export
const
TOKEN_TYPES
=
[
'
author
'
,
'
assignee
'
];
export
const
USER_
TOKEN_TYPES
=
[
'
author
'
,
'
assignee
'
];
app/assets/javascripts/filtered_search/visual_token_value.js
View file @
d5ff5410
...
@@ -6,7 +6,7 @@ import DropdownUtils from '~/filtered_search/dropdown_utils';
...
@@ -6,7 +6,7 @@ import DropdownUtils from '~/filtered_search/dropdown_utils';
import
Flash
from
'
~/flash
'
;
import
Flash
from
'
~/flash
'
;
import
UsersCache
from
'
~/lib/utils/users_cache
'
;
import
UsersCache
from
'
~/lib/utils/users_cache
'
;
import
{
__
}
from
'
~/locale
'
;
import
{
__
}
from
'
~/locale
'
;
import
{
TOKEN_TYPES
}
from
'
ee_else_ce/filtered_search/constants
'
;
import
{
USER_
TOKEN_TYPES
}
from
'
ee_else_ce/filtered_search/constants
'
;
export
default
class
VisualTokenValue
{
export
default
class
VisualTokenValue
{
constructor
(
tokenValue
,
tokenType
)
{
constructor
(
tokenValue
,
tokenType
)
{
...
@@ -23,7 +23,7 @@ export default class VisualTokenValue {
...
@@ -23,7 +23,7 @@ export default class VisualTokenValue {
if
(
tokenType
===
'
label
'
)
{
if
(
tokenType
===
'
label
'
)
{
this
.
updateLabelTokenColor
(
tokenValueContainer
);
this
.
updateLabelTokenColor
(
tokenValueContainer
);
}
else
if
(
TOKEN_TYPES
.
includes
(
tokenType
))
{
}
else
if
(
USER_
TOKEN_TYPES
.
includes
(
tokenType
))
{
this
.
updateUserTokenAppearance
(
tokenValueContainer
,
tokenValueElement
);
this
.
updateUserTokenAppearance
(
tokenValueContainer
,
tokenValueElement
);
}
else
if
(
tokenType
===
'
my-reaction
'
)
{
}
else
if
(
tokenType
===
'
my-reaction
'
)
{
this
.
updateEmojiTokenAppearance
(
tokenValueContainer
,
tokenValueElement
);
this
.
updateEmojiTokenAppearance
(
tokenValueContainer
,
tokenValueElement
);
...
...
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