diff options
author | Sam Bigelow <sbigelow@gitlab.com> | 2018-11-30 08:48:47 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-11-30 08:48:47 +0000 |
commit | 44a0121ad4a0851d7b7c723afebd3c4b07adc6c3 (patch) | |
tree | 959cd708f81bc45f1c4737a1753fc6f95160a8db /app/assets/javascripts/diffs/components/diff_line_gutter_content.vue | |
parent | 0d5cbd16ee3b8eac49d134af063b1827748f2b6d (diff) | |
download | gitlab-ce-44a0121ad4a0851d7b7c723afebd3c4b07adc6c3.tar.gz |
Resolve "Merge request refactor does not highlight selected line"
Diffstat (limited to 'app/assets/javascripts/diffs/components/diff_line_gutter_content.vue')
-rw-r--r-- | app/assets/javascripts/diffs/components/diff_line_gutter_content.vue | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue b/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue index aecdd133bf8..c0613d80d37 100644 --- a/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue +++ b/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue @@ -72,6 +72,13 @@ export default { diffFiles: state => state.diffs.diffFiles, }), ...mapGetters(['isLoggedIn']), + lineCode() { + return ( + this.line.line_code || + (this.line.left && this.line.line.left.line_code) || + (this.line.right && this.line.right.line_code) + ); + }, lineHref() { return `#${this.line.line_code || ''}`; }, @@ -97,7 +104,7 @@ export default { }, }, methods: { - ...mapActions('diffs', ['loadMoreLines', 'showCommentForm']), + ...mapActions('diffs', ['loadMoreLines', 'showCommentForm', 'setHighlightedRow']), handleCommentButton() { this.showCommentForm({ lineCode: this.line.line_code, fileHash: this.fileHash }); }, @@ -168,7 +175,13 @@ export default { > <icon :size="12" name="comment" /> </button> - <a v-if="lineNumber" :data-linenumber="lineNumber" :href="lineHref"> </a> + <a + v-if="lineNumber" + :data-linenumber="lineNumber" + :href="lineHref" + @click="setHighlightedRow(lineCode);" + > + </a> <diff-gutter-avatars v-if="shouldShowAvatarsOnGutter" :discussions="line.discussions" /> </template> </div> |