diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2017-01-09 11:33:17 -0600 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-01-09 16:01:38 -0600 |
| commit | 1bfdad5c4707c9dac243cebaf4666fee77f17891 (patch) | |
| tree | 23f9333d3692dcf87a99c8900f5fbd732c4b75c6 | |
| parent | 3d0b0a62609d5f961d2777f497558d90c1dc039b (diff) | |
| download | gitlab-ce-1bfdad5c4707c9dac243cebaf4666fee77f17891.tar.gz | |
Code review changes
| -rw-r--r-- | app/assets/javascripts/dispatcher.js.es6 | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/droplab/droplab_ajax.js | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/filtered_search/filtered_search_tokenizer.js.es6 | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/dispatcher.js.es6 b/app/assets/javascripts/dispatcher.js.es6 index ca2da18dc26..99a34651639 100644 --- a/app/assets/javascripts/dispatcher.js.es6 +++ b/app/assets/javascripts/dispatcher.js.es6 @@ -84,7 +84,7 @@ break; case 'projects:merge_requests:index': case 'projects:issues:index': - if (document.querySelector('.filtered-search') && gl.FilteredSearchManager) { + if (gl.FilteredSearchManager) { new gl.FilteredSearchManager(); } Issuable.init(); diff --git a/app/assets/javascripts/droplab/droplab_ajax.js b/app/assets/javascripts/droplab/droplab_ajax.js index ebb518eeef4..926e53e696f 100644 --- a/app/assets/javascripts/droplab/droplab_ajax.js +++ b/app/assets/javascripts/droplab/droplab_ajax.js @@ -39,7 +39,7 @@ require('../window')(function(w){ var loadingTemplate = document.createElement('div'); loadingTemplate.innerHTML = config.loadingTemplate; - loadingTemplate.setAttribute('data-loading-template', true); + loadingTemplate.setAttribute('data-loading-template', ''); this.listTemplate = dynamicList.outerHTML; dynamicList.outerHTML = loadingTemplate.outerHTML; diff --git a/app/assets/javascripts/filtered_search/filtered_search_tokenizer.js.es6 b/app/assets/javascripts/filtered_search/filtered_search_tokenizer.js.es6 index 60473dddead..cf53845a48b 100644 --- a/app/assets/javascripts/filtered_search/filtered_search_tokenizer.js.es6 +++ b/app/assets/javascripts/filtered_search/filtered_search_tokenizer.js.es6 @@ -1,6 +1,8 @@ (() => { class FilteredSearchTokenizer { static processTokens(input) { + // Regex extracts `(token):(symbol)(value)` + // Values that start with a double quote must end in a double quote (same for single) const tokenRegex = /(\w+):([~%@]?)(?:('[^']*'{0,1})|("[^"]*"{0,1})|(\S+))/g; const tokens = []; let lastToken = null; |