From 106592115da43b2719c4daca32e30ab930814b40 Mon Sep 17 00:00:00 2001 From: Natalia Tepluhina Date: Mon, 25 Mar 2019 08:51:29 +0000 Subject: [PATCH] Resolve "Code in other column of side-by-side diff is highlighted when selecting code on one side" --- .../diffs/components/parallel_diff_table_row.vue | 4 ++-- changelogs/unreleased/48297-fix-code-selection.yml | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 changelogs/unreleased/48297-fix-code-selection.yml diff --git a/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue b/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue index caf0df8a4e3..c60246bf8ef 100644 --- a/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue +++ b/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue @@ -140,7 +140,7 @@ export default { :id="line.left.line_code" :class="parallelViewLeftLineType" class="line_content parallel left-side" - @mousedown.native="handleParallelLineMouseDown" + @mousedown="handleParallelLineMouseDown" v-html="line.left.rich_text" > @@ -171,7 +171,7 @@ export default { }, ]" class="line_content parallel right-side" - @mousedown.native="handleParallelLineMouseDown" + @mousedown="handleParallelLineMouseDown" v-html="line.right.rich_text" > diff --git a/changelogs/unreleased/48297-fix-code-selection.yml b/changelogs/unreleased/48297-fix-code-selection.yml new file mode 100644 index 00000000000..14841b00969 --- /dev/null +++ b/changelogs/unreleased/48297-fix-code-selection.yml @@ -0,0 +1,6 @@ +--- +title: Resolve Code in other column of side-by-side diff is highlighted when selecting + code on one side +merge_request: 26423 +author: +type: fixed -- GitLab