diff options
author | Phil Hughes <me@iamphill.com> | 2017-05-24 12:00:26 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-05-24 12:00:26 +0300 |
commit | 6cbc69aa7eb9fc054b62ad6e20bda10f12228c18 (patch) | |
tree | c7d1f58ead48e8fbb245d52d7a18c99fec97fec1 /app/assets/javascripts/filtered_search/filtered_search_tokenizer.js | |
parent | a5f435098ee5db95ab5f9251ef5739193f6c2694 (diff) | |
parent | 681f3296448c12a3dc53392647b794b51f1ec817 (diff) |
Merge branch '32563-remove-duplicated-config-code-for-filtered-search-dropdowns' into 'master'
Resolve "Remove duplicated config code for filtered search dropdowns"
Closes #32563
See merge request !11512
Diffstat (limited to 'app/assets/javascripts/filtered_search/filtered_search_tokenizer.js')
-rw-r--r-- | app/assets/javascripts/filtered_search/filtered_search_tokenizer.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/javascripts/filtered_search/filtered_search_tokenizer.js b/app/assets/javascripts/filtered_search/filtered_search_tokenizer.js index aa513b3aeae..f2e66503e5e 100644 --- a/app/assets/javascripts/filtered_search/filtered_search_tokenizer.js +++ b/app/assets/javascripts/filtered_search/filtered_search_tokenizer.js @@ -1,8 +1,7 @@ import './filtered_search_token_keys'; class FilteredSearchTokenizer { - static processTokens(input) { - const allowedKeys = gl.FilteredSearchTokenKeys.get().map(i => i.key); + static processTokens(input, allowedKeys) { // Regex extracts `(token):(symbol)(value)` // Values that start with a double quote must end in a double quote (same for single) const tokenRegex = new RegExp(`(${allowedKeys.join('|')}):([~%@]?)(?:('[^']*'{0,1})|("[^"]*"{0,1})|(\\S+))`, 'g'); |