summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/diffs/components/inline_diff_table_row.vue
diff options
context:
space:
mode:
authorSam Bigelow <sbigelow@gitlab.com>2018-11-30 08:48:47 +0000
committerPhil Hughes <me@iamphill.com>2018-11-30 08:48:47 +0000
commit44a0121ad4a0851d7b7c723afebd3c4b07adc6c3 (patch)
tree959cd708f81bc45f1c4737a1753fc6f95160a8db /app/assets/javascripts/diffs/components/inline_diff_table_row.vue
parent0d5cbd16ee3b8eac49d134af063b1827748f2b6d (diff)
downloadgitlab-ce-44a0121ad4a0851d7b7c723afebd3c4b07adc6c3.tar.gz
Resolve "Merge request refactor does not highlight selected line"
Diffstat (limited to 'app/assets/javascripts/diffs/components/inline_diff_table_row.vue')
-rw-r--r--app/assets/javascripts/diffs/components/inline_diff_table_row.vue20
1 files changed, 18 insertions, 2 deletions
diff --git a/app/assets/javascripts/diffs/components/inline_diff_table_row.vue b/app/assets/javascripts/diffs/components/inline_diff_table_row.vue
index 8d53fbded73..c764cbeb8e0 100644
--- a/app/assets/javascripts/diffs/components/inline_diff_table_row.vue
+++ b/app/assets/javascripts/diffs/components/inline_diff_table_row.vue
@@ -1,5 +1,5 @@
<script>
-import { mapGetters, mapActions } from 'vuex';
+import { mapGetters, mapActions, mapState } from 'vuex';
import DiffTableCell from './diff_table_cell.vue';
import {
NEW_LINE_TYPE,
@@ -40,6 +40,11 @@ export default {
};
},
computed: {
+ ...mapState({
+ isHighlighted(state) {
+ return this.line.line_code !== null && this.line.line_code === state.diffs.highlightedRow;
+ },
+ }),
...mapGetters('diffs', ['isInlineView']),
isContextLine() {
return this.line.type === CONTEXT_LINE_TYPE;
@@ -91,6 +96,7 @@ export default {
:is-bottom="isBottom"
:is-hover="isHover"
:show-comment-button="true"
+ :is-highlighted="isHighlighted"
class="diff-line-num old_line"
/>
<diff-table-cell
@@ -100,8 +106,18 @@ export default {
:line-type="newLineType"
:is-bottom="isBottom"
:is-hover="isHover"
+ :is-highlighted="isHighlighted"
class="diff-line-num new_line qa-new-diff-line"
/>
- <td :class="line.type" class="line_content" v-html="line.rich_text"></td>
+ <td
+ :class="[
+ line.type,
+ {
+ hll: isHighlighted,
+ },
+ ]"
+ class="line_content"
+ v-html="line.rich_text"
+ ></td>
</tr>
</template>