summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-06-16 11:35:56 +0100
committerPhil Hughes <me@iamphill.com>2016-06-20 11:55:59 +0100
commitc9cc64f5650465ddddb78b91bb004acf683a86b7 (patch)
tree268442e15555037af7416471fba42250bcc4eb23
parent77c8600a39fb357198459b1dc47e23a994ed4211 (diff)
downloadgitlab-ce-c9cc64f5650465ddddb78b91bb004acf683a86b7.tar.gz
Fixed issue with focusing out of dropdown not hiding menu
-rw-r--r--app/assets/javascripts/gl_dropdown.js.coffee6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee
index 2a8a1f05b35..fdb6190ec3f 100644
--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
@@ -216,6 +216,12 @@ class GitLabDropdown
@dropdown.on 'keyup', (e) =>
if e.which is 27 # Escape key
$('.dropdown-menu-close', @dropdown).trigger 'click'
+ @dropdown.on 'blur', 'a', (e) =>
+ $relatedTarget = $(e.relatedTarget)
+ $dropdownMenu = $relatedTarget.closest('.dropdown-menu')
+
+ if $dropdownMenu.length is 0
+ @dropdown.removeClass('open')
if @dropdown.find(".dropdown-toggle-page").length
@dropdown.find(".dropdown-toggle-page, .dropdown-menu-back").on "click", (e) =>