diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-07-21 09:28:55 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-07-21 09:28:55 +0000 |
| commit | 3ba8d28f31a6cdfbdfe278e83abb62ab27dd2657 (patch) | |
| tree | ea73a011ebff05af40adbcf4bbcf405a53afe075 | |
| parent | 825548140c47d84a116358052891962a8ffd9b55 (diff) | |
| parent | 71bb7bdf612097aa05cbd654f720d25d36598f17 (diff) | |
| download | gitlab-ce-3ba8d28f31a6cdfbdfe278e83abb62ab27dd2657.tar.gz | |
Merge branch 'gl-dropdown-enter-key-fix' into 'master'
Fixed dropdown enter key when searching
## What does this MR do?
When searching in a dropdown you can now just press the enter key to trigger a click on the first row rather than having to press the down key & then enter.
## What are the relevant issue numbers?
Closes #19741
See merge request !5231
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/gl_dropdown.js.coffee | 15 |
2 files changed, 15 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 3ae4e0ff629..7077d630c5b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -47,6 +47,7 @@ v 8.10.0 (unreleased) - Make images fit to the size of the viewport !4810 - Fix check for New Branch button on Issue page !4630 (winniehell) - Fix GFM autocomplete not working on wiki pages + - Fixed enter key not triggering click on first row when searching in a dropdown - Fix MR-auto-close text added to description. !4836 - Support U2F devices in Firefox. !5177 - Fix issue, preventing users w/o push access to sort tags !5105 (redetection) diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee index 951530e03a5..7086ece29b8 100644 --- a/app/assets/javascripts/gl_dropdown.js.coffee +++ b/app/assets/javascripts/gl_dropdown.js.coffee @@ -210,9 +210,22 @@ class GitLabDropdown data: => return @fullData callback: (data) => - currentIndex = -1 @parseData data + unless @filterInput.val() is '' + selector = '.dropdown-content li:not(.divider):visible' + + if @dropdown.find('.dropdown-toggle-page').length + selector = ".dropdown-page-one #{selector}" + + $(selector, @dropdown) + .first() + .find('a') + .addClass('is-focused') + + currentIndex = 0 + + # Event listeners @dropdown.on "shown.bs.dropdown", @opened |