1 files changed, 16 insertions, 14 deletions

diff --git a/app/assets/javascripts/search_autocomplete.js.es6 b/app/assets/javascripts/search_autocomplete.js.es6
index cec8856d4e7..6250e75d407 100644
--- a/app/assets/javascripts/search_autocomplete.js.es6
+++ b/app/assets/javascripts/search_autocomplete.js.es6
@@ -1,7 +1,6 @@
-/* eslint-disable comma-dangle, no-return-assign, one-var, no-var, no-underscore-dangle, one-var-declaration-per-line, no-unused-vars, no-cond-assign, consistent-return, object-shorthand, prefer-arrow-callback, func-names, space-before-function-paren, no-plusplus, prefer-template, quotes, class-methods-use-this, no-unused-expressions, no-sequences, wrap-iife, no-lonely-if, no-else-return, no-param-reassign, vars-on-top, padded-blocks, no-extra-semi, indent, max-len */
+/* eslint-disable comma-dangle, no-return-assign, one-var, no-var, no-underscore-dangle, one-var-declaration-per-line, no-unused-vars, no-cond-assign, consistent-return, object-shorthand, prefer-arrow-callback, func-names, space-before-function-paren, prefer-template, quotes, class-methods-use-this, no-unused-expressions, no-sequences, wrap-iife, no-lonely-if, no-else-return, no-param-reassign, vars-on-top, max-len */
 
 ((global) => {
-
   const KEYCODE = {
     ESCAPE: 27,
     BACKSPACE: 8,
@@ -70,12 +69,17 @@
         search: {
           fields: ['text']
         },
+        id: this.getSearchText,
         data: this.getData.bind(this),
         selectable: true,
         clicked: this.onClick.bind(this)
       });
     }
 
+    getSearchText(selectedObject, el) {
+      return selectedObject.id ? selectedObject.text : '';
+    }
+
     getData(term, callback) {
       var _this, contents, jqXHR;
       _this = this;
@@ -105,7 +109,7 @@
         data = [];
         // List results
         firstCategory = true;
-        for (i = 0, len = response.length; i < len; i++) {
+        for (i = 0, len = response.length; i < len; i += 1) {
           suggestion = response[i];
           // Add group header before list each group
           if (lastCategory !== suggestion.category) {
@@ -216,7 +220,7 @@
         this.dropdown.addClass('open').trigger('shown.bs.dropdown');
         return this.searchInput.removeClass('disabled');
       }
-    };
+    }
 
       // Saves last length of the entered text
     onSearchInputKeyDown() {
@@ -280,12 +284,12 @@
       return this.searchInput.val();
     }
 
-   onClearInputClick(e) {
+    onClearInputClick(e) {
       e.preventDefault();
       return this.searchInput.val('').focus();
     }
 
-   onSearchInputBlur(e) {
+    onSearchInputBlur(e) {
       this.isFocused = false;
       this.wrap.removeClass('search-active');
       // If input is blank then restore state
@@ -305,12 +309,12 @@
 
     hasLocationBadge() {
       return this.wrap.is('.has-location-badge');
-    };
+    }
 
     restoreOriginalState() {
       var i, input, inputs, len;
       inputs = Object.keys(this.originalState);
-      for (i = 0, len = inputs.length; i < len; i++) {
+      for (i = 0, len = inputs.length; i < len; i += 1) {
         input = inputs[i];
         this.getElement("#" + input).val(this.originalState[input]);
       }
@@ -331,7 +335,7 @@
       var i, input, inputs, len, results;
       inputs = Object.keys(this.originalState);
       results = [];
-      for (i = 0, len = inputs.length; i < len; i++) {
+      for (i = 0, len = inputs.length; i < len; i += 1) {
         input = inputs[i];
         // _location isnt a input
         if (input === '_location') {
@@ -361,11 +365,11 @@
       var html;
       html = "<ul> <li><a class='dropdown-menu-empty-link is-focused'>Loading...</a></li> </ul>";
       return this.dropdownContent.html(html);
-    };
+    }
 
     onClick(item, $el, e) {
       if (location.pathname.indexOf(item.url) !== -1) {
-        e.preventDefault();
+        if (!e.metaKey) e.preventDefault();
         if (!this.badgePresent) {
           if (item.category === 'Projects') {
             this.projectInputEl.val(item.id);
@@ -384,8 +388,7 @@
         this.disableAutocomplete();
         return this.searchInput.val('').focus();
       }
-    };
-
+    }
   }
 
   global.SearchAutocomplete = SearchAutocomplete;
@@ -426,5 +429,4 @@
       };
     }
   });
-
 })(window.gl || (window.gl = {}));