summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2016-12-18 17:04:29 -0600
committerClement Ho <ClemMakesApps@gmail.com>2017-01-09 16:01:34 -0600
commit12753def903f265467d2cab8e19deced31daf066 (patch)
tree7680425083030fa2bb427328e2079de072043f4a /app
parentf72c1bf1c930b4dcb533202204d132f42246d99f (diff)
downloadgitlab-ce-12753def903f265467d2cab8e19deced31daf066.tar.gz
Fix specs
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/dispatcher.js.es62
-rw-r--r--app/assets/javascripts/filtered_search/dropdown_utils.js.es62
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/dispatcher.js.es6 b/app/assets/javascripts/dispatcher.js.es6
index 1e9111f4718..ca2da18dc26 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 (document.querySelector('.filtered-search') && gl.FilteredSearchManager) {
new gl.FilteredSearchManager();
}
Issuable.init();
diff --git a/app/assets/javascripts/filtered_search/dropdown_utils.js.es6 b/app/assets/javascripts/filtered_search/dropdown_utils.js.es6
index 0c0d24d4de8..3453311bee5 100644
--- a/app/assets/javascripts/filtered_search/dropdown_utils.js.es6
+++ b/app/assets/javascripts/filtered_search/dropdown_utils.js.es6
@@ -43,7 +43,7 @@
static filterHint(item, query) {
const updatedItem = item;
let { lastToken } = gl.FilteredSearchTokenizer.processTokens(query);
- lastToken = lastToken || '';
+ lastToken = lastToken.key || lastToken || '';
if (!lastToken || query.split('').last() === ' ') {
updatedItem.droplab_hidden = false;