diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-04-27 16:11:31 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-04-27 16:11:31 +0000 |
| commit | 7640e60a50a4ce681a68639780ca821a7c8b8a8e (patch) | |
| tree | b7d04cac8c2a02b6b0aab94d7007cef78fcbb208 | |
| parent | 6c0ed6399054db00d8abcc33ad2aa7df59de52bf (diff) | |
| parent | df0cdc8cb4757a500b511e176f77b2c6a337a57e (diff) | |
| download | gitlab-ce-7640e60a50a4ce681a68639780ca821a7c8b8a8e.tar.gz | |
Merge branch 'esc-close-dropdown' into 'master'
Escape key closes the dropdown
Fixes #15432
See merge request !3904
| -rw-r--r-- | app/assets/javascripts/gl_dropdown.js.coffee | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee index 29466e9f2ed..1d1bfeb2e77 100644 --- a/app/assets/javascripts/gl_dropdown.js.coffee +++ b/app/assets/javascripts/gl_dropdown.js.coffee @@ -184,6 +184,9 @@ class GitLabDropdown @dropdown.on "shown.bs.dropdown", @opened @dropdown.on "hidden.bs.dropdown", @hidden @dropdown.on "click", ".dropdown-menu, .dropdown-menu-close", @shouldPropagate + @dropdown.on 'keyup', (e) => + if e.which is 27 # Escape key + $('.dropdown-menu-close', @dropdown).trigger 'click' if @dropdown.find(".dropdown-toggle-page").length @dropdown.find(".dropdown-toggle-page, .dropdown-menu-back").on "click", (e) => |