diff options
| author | Heinrich Lee Yu <hleeyu@gmail.com> | 2018-11-14 15:28:57 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-11-14 15:28:57 +0000 |
| commit | 670e977287b3cdf89e17384dedf66328e806c12e (patch) | |
| tree | f072d1844357c375b4bbd2e56cdb5027d8398501 /app/assets | |
| parent | 51c09c381b98d55a70c54c0ca709161dd75e808d (diff) | |
| download | gitlab-ce-670e977287b3cdf89e17384dedf66328e806c12e.tar.gz | |
Disable updating appearance of filter tokens for special values
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js b/app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js index c23d4c484a5..89dcff74d0e 100644 --- a/app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js +++ b/app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js @@ -135,10 +135,6 @@ export default class FilteredSearchVisualTokens { } static updateUserTokenAppearance(tokenValueContainer, tokenValueElement, tokenValue) { - if (tokenValue === 'none') { - return Promise.resolve(); - } - const username = tokenValue.replace(/^@/, ''); return ( UsersCache.retrieve(username) @@ -184,7 +180,12 @@ export default class FilteredSearchVisualTokens { const tokenValueElement = tokenValueContainer.querySelector('.value'); tokenValueElement.innerText = tokenValue; + if (tokenValue === 'none' || tokenValue === 'any') { + return; + } + const tokenType = tokenName.toLowerCase(); + if (tokenType === 'label') { FilteredSearchVisualTokens.updateLabelTokenColor(tokenValueContainer, tokenValue); } else if (tokenType === 'author' || tokenType === 'assignee') { |