From 5c7181b51492bd3ee13c5b498ac117ba08576ea8 Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Mon, 18 Apr 2016 14:37:18 -0500 Subject: [PATCH] Add is-link attribute to know if a menu item should not be stopped --- app/assets/javascripts/gl_dropdown.js.coffee | 2 +- app/views/shared/issuable/_sidebar.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee index fa1f765095a..398d3ba4dc8 100644 --- a/app/assets/javascripts/gl_dropdown.js.coffee +++ b/app/assets/javascripts/gl_dropdown.js.coffee @@ -247,7 +247,7 @@ class GitLabDropdown if @options.multiSelect $target = $(e.target) - if not $target.hasClass('dropdown-menu-close') and not $target.hasClass('dropdown-menu-close-icon') and ($target.attr('href') is '#') + if not $target.hasClass('dropdown-menu-close') and not $target.hasClass('dropdown-menu-close-icon') and not $target.data('is-link') e.stopPropagation() return false else diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index ef670bc9baa..62b95824bab 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -113,7 +113,7 @@ %a.dropdown-toggle-page{href: "#"} Create new %li - = link_to namespace_project_labels_path(@project.namespace, @project) do + = link_to namespace_project_labels_path(@project.namespace, @project), :"data-is-link" => true do - if can? current_user, :admin_label, @project Manage labels - else -- GitLab