diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-20 12:10:03 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-20 12:10:03 +0000 |
| commit | 43b4b3e2d2ddebc0a89b94a8251c162ec5719780 (patch) | |
| tree | 8a21146370cfd1b24b25cfcacef53e889746f5aa /app/assets/javascripts/filtered_search | |
| parent | 196ada0844fff7642463fbd08a44609a1e1fa713 (diff) | |
| download | gitlab-ce-43b4b3e2d2ddebc0a89b94a8251c162ec5719780.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/filtered_search')
| -rw-r--r-- | app/assets/javascripts/filtered_search/dropdown_operator.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/filtered_search/dropdown_operator.js b/app/assets/javascripts/filtered_search/dropdown_operator.js index d9794e326f8..0c8c8140ee9 100644 --- a/app/assets/javascripts/filtered_search/dropdown_operator.js +++ b/app/assets/javascripts/filtered_search/dropdown_operator.js @@ -24,10 +24,12 @@ export default class DropdownOperator extends FilteredSearchDropdown { if (selected.tagName === 'LI') { if (selected.hasAttribute('data-value')) { + const name = FilteredSearchVisualTokens.getLastTokenPartial(); const operator = selected.dataset.value; + FilteredSearchVisualTokens.removeLastTokenPartial(); FilteredSearchDropdownManager.addWordToInput({ - tokenName: this.filter, + tokenName: name, tokenOperator: operator, clicked: false, }); @@ -38,8 +40,6 @@ export default class DropdownOperator extends FilteredSearchDropdown { } renderContent(forceShowList = false) { - this.filter = FilteredSearchVisualTokens.getLastTokenPartial(); - const dropdownData = [ { tag: 'equal', |