diff options
author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-03-17 22:15:47 +0300 |
---|---|---|
committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-03-25 15:10:25 +0300 |
commit | 8c1e3c77cd4da2fff126e46bc40b70fef798ac79 (patch) | |
tree | c23a7ccdb84ed39fdd832d4fe39f2cd85d9eda78 /app/assets/javascripts/gl_dropdown.js.coffee | |
parent | 22aef628085b486db02804246e71e154e6516156 (diff) |
Add multi select stay open functionality
Diffstat (limited to 'app/assets/javascripts/gl_dropdown.js.coffee')
-rw-r--r-- | app/assets/javascripts/gl_dropdown.js.coffee | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee index a1a0e1ecb08..3694407c31a 100644 --- a/app/assets/javascripts/gl_dropdown.js.coffee +++ b/app/assets/javascripts/gl_dropdown.js.coffee @@ -129,7 +129,7 @@ class GitLabDropdown @dropdown.on "shown.bs.dropdown", @opened @dropdown.on "hidden.bs.dropdown", @hidden - @dropdown.on "click", ".dropdown-menu", @shouldPropagate + @dropdown.on "click", ".dropdown-menu, .dropdown-menu-close", @shouldPropagate if @dropdown.find(".dropdown-toggle-page").length @dropdown.find(".dropdown-toggle-page, .dropdown-menu-back").on "click", (e) => @@ -181,7 +181,12 @@ class GitLabDropdown shouldPropagate: (e) => if @options.multiSelect - e.stopPropagation() + $target = $(e.target) + if not $target.hasClass('dropdown-menu-close') and not $target.hasClass('dropdown-menu-close-icon') + e.stopPropagation() + return false + else + return true opened: => contentHtml = $('.dropdown-content', @dropdown).html() |