From 1aff95c76844adb880e7f935deab8af5e797fb51 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Thu, 6 Oct 2016 16:14:12 +0100 Subject: Fix issue when clicking links inside issue showing sidebar --- app/assets/javascripts/boards/components/board_card.js.es6 | 6 +++++- app/views/projects/boards/components/_card.html.haml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/boards/components/board_card.js.es6 b/app/assets/javascripts/boards/components/board_card.js.es6 index 27c78e7f02e..bcb1b60b978 100644 --- a/app/assets/javascripts/boards/components/board_card.js.es6 +++ b/app/assets/javascripts/boards/components/board_card.js.es6 @@ -61,7 +61,11 @@ this.showDetail = false; } }, - showIssue () { + showIssue (e) { + const targetTagName = e.target.tagName.toLowerCase(); + + if (targetTagName === 'a' || targetTagName === 'button') return; + if (this.showDetail) { this.showDetail = false; diff --git a/app/views/projects/boards/components/_card.html.haml b/app/views/projects/boards/components/_card.html.haml index d466165816f..5cfd42485c5 100644 --- a/app/views/projects/boards/components/_card.html.haml +++ b/app/views/projects/boards/components/_card.html.haml @@ -11,7 +11,7 @@ ":index" => "index", "@mousedown" => "mouseDown", "@mouseMove" => "mouseMove", - "@mouseup" => "showIssue" } + "@mouseup" => "showIssue($event)" } %h4.card-title = icon("eye-slash", class: "confidential-icon", "v-if" => "issue.confidential") %a{ ":href" => "issueLinkBase + '/' + issue.id", -- cgit v1.2.1