diff options
| author | Phil Hughes <me@iamphill.com> | 2017-01-19 10:30:29 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-01-21 20:05:02 +0000 |
| commit | 658c6c26c384c64e3535e87b5c7bfd550632ff29 (patch) | |
| tree | 071e2feecfb0635e142c6d188577773f2e4c4f94 | |
| parent | c45dc8027ce934550efc6091237d94104397033b (diff) | |
| download | gitlab-ce-658c6c26c384c64e3535e87b5c7bfd550632ff29.tar.gz | |
Fixed filter issue
3 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/filtered_search/dropdown_non_user.js.es6 b/app/assets/javascripts/filtered_search/dropdown_non_user.js.es6 index f06c3fc9c6f..13cbec1be4a 100644 --- a/app/assets/javascripts/filtered_search/dropdown_non_user.js.es6 +++ b/app/assets/javascripts/filtered_search/dropdown_non_user.js.es6 @@ -15,7 +15,7 @@ loadingTemplate: this.loadingTemplate, }, droplabFilter: { - filterFunction: gl.DropdownUtils.filterWithSymbol.bind(null, this.symbol), + filterFunction: gl.DropdownUtils.filterWithSymbol.bind(null, this.symbol, input), }, }; } diff --git a/app/assets/javascripts/filtered_search/dropdown_utils.js.es6 b/app/assets/javascripts/filtered_search/dropdown_utils.js.es6 index 1bfcbd011b0..dcab32fd38b 100644 --- a/app/assets/javascripts/filtered_search/dropdown_utils.js.es6 +++ b/app/assets/javascripts/filtered_search/dropdown_utils.js.es6 @@ -20,8 +20,9 @@ return escapedText; } - static filterWithSymbol(filterSymbol, item, query) { + static filterWithSymbol(filterSymbol, input, item) { const updatedItem = item; + const query = gl.DropdownUtils.getSearchInput(input).trim(); const { lastToken, searchToken } = gl.FilteredSearchTokenizer.processTokens(query); if (lastToken !== searchToken) { diff --git a/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js.es6 b/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js.es6 index 95c8761638c..a64818497c1 100644 --- a/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js.es6 +++ b/app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js.es6 @@ -85,10 +85,9 @@ this.font = window.getComputedStyle(this.filteredSearchInput).font; } + const inputText = gl.DropdownUtils.getSearchInput(this.filteredSearchInput).trim(); const filterIconPadding = 27; - const offset = gl.text - .getTextWidth(gl.DropdownUtils.getSearchInput(this.filteredSearchInput).trim(), this.font) - + filterIconPadding; + const offset = gl.text.getTextWidth(inputText, this.font) + filterIconPadding; this.mapping[key].reference.setOffset(offset); } @@ -146,7 +145,7 @@ const { lastToken, searchToken } = this.tokenizer .processTokens(gl.DropdownUtils.getSearchInput(this.filteredSearchInput)); - if (this.filteredSearchInput.value.split('').last() === ' ') { + if (this.currentDropdown) { this.updateCurrentDropdownOffset(); } |