diff options
| author | Phil Hughes <me@iamphill.com> | 2016-10-06 16:14:12 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-10-07 09:15:46 +0100 |
| commit | 1aff95c76844adb880e7f935deab8af5e797fb51 (patch) | |
| tree | e8008ae9f74232abd00efbc306dc76f0ea4a3aaa | |
| parent | 0c286d54737f685caf7ec21320d43d8069f2001d (diff) | |
| download | gitlab-ce-1aff95c76844adb880e7f935deab8af5e797fb51.tar.gz | |
Fix issue when clicking links inside issue showing sidebar
| -rw-r--r-- | app/assets/javascripts/boards/components/board_card.js.es6 | 6 | ||||
| -rw-r--r-- | 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", |