diff options
| author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-07-27 01:17:07 +0100 |
|---|---|---|
| committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-08-18 18:17:56 +0100 |
| commit | dcf09a532b7eff230bf2a646fdb96e9aa43ff189 (patch) | |
| tree | 100b7f4ea336ce17b2e474609fff22f0c80158e0 /app/assets/javascripts/search_autocomplete.js | |
| parent | e74d12a9b3e76c6d49ff1c57bd6471073d34be4a (diff) | |
| download | gitlab-ce-dcf09a532b7eff230bf2a646fdb96e9aa43ff189.tar.gz | |
Moved changes across to es5 and changed spec to es6
Diffstat (limited to 'app/assets/javascripts/search_autocomplete.js')
| -rw-r--r-- | app/assets/javascripts/search_autocomplete.js | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/app/assets/javascripts/search_autocomplete.js b/app/assets/javascripts/search_autocomplete.js index 990f6536eb2..cd39f5f94e2 100644 --- a/app/assets/javascripts/search_autocomplete.js +++ b/app/assets/javascripts/search_autocomplete.js @@ -7,7 +7,9 @@ KEYCODE = { ESCAPE: 27, BACKSPACE: 8, - ENTER: 13 + ENTER: 13, + UP: 38, + DOWN: 40 }; function SearchAutocomplete(opts) { @@ -223,6 +225,12 @@ case KEYCODE.ESCAPE: this.restoreOriginalState(); break; + case KEYCODE.ENTER: + this.disableAutocomplete(); + break; + case KEYCODE.UP, + case KEYCODE.DOWN: + return; default: if (this.searchInput.val() === '') { this.disableAutocomplete(); @@ -319,9 +327,11 @@ }; SearchAutocomplete.prototype.disableAutocomplete = function() { - this.searchInput.addClass('disabled'); - this.dropdown.removeClass('open'); - return this.restoreMenu(); + if (!this.searchInput.hasClass('disabled') && this.dropdown.hasClass('open')) { + this.searchInput.addClass('disabled'); + this.dropdown.removeClass('open').trigger('hidden.bs.dropdown'); + this.restoreMenu(); + } }; SearchAutocomplete.prototype.restoreMenu = function() { |