summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/notes/components/diff_file_header.vue
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/notes/components/diff_file_header.vue')
-rw-r--r--app/assets/javascripts/notes/components/diff_file_header.vue39
1 files changed, 35 insertions, 4 deletions
diff --git a/app/assets/javascripts/notes/components/diff_file_header.vue b/app/assets/javascripts/notes/components/diff_file_header.vue
index 94d9dc69964..3e09391a9ac 100644
--- a/app/assets/javascripts/notes/components/diff_file_header.vue
+++ b/app/assets/javascripts/notes/components/diff_file_header.vue
@@ -12,17 +12,48 @@ export default {
type: Object,
required: true,
},
+ collapsible: {
+ type: Boolean,
+ required: false,
+ default: false,
+ },
+ addMergeRequestButtons: {
+ type: Boolean,
+ required: false,
+ default: false,
+ },
},
computed: {
titleTag() {
- return this.diffFile.discussionPath ? 'a' : 'span';
+ return this.diffFile.fileHash ? 'a' : 'span';
+ },
+ },
+ methods: {
+ handleToggle(e, checkTarget) {
+ if (checkTarget) {
+ if (e.target === this.$refs.header) {
+ this.$emit('toggleFile');
+ }
+ } else {
+ this.$emit('toggleFile');
+ }
},
+ noop() {},
},
};
</script>
<template>
- <div class="file-header-content">
+ <div
+ @click="handleToggle($event, true)"
+ ref="header"
+ class="file-header-content"
+ >
+ <i
+ v-if="collapsible"
+ @click.stop="handleToggle"
+ class="fa diff-toggle-caret fa-fw fa-caret-down"
+ ></i>
<div
v-if="diffFile.submodule"
>
@@ -33,8 +64,8 @@ export default {
class="file-title-name"
></strong>
<clipboard-button
- title="Copy file path to clipboard"
:text="diffFile.submoduleLink"
+ title="Copy file path to clipboard"
css-class="btn-default btn-transparent btn-clipboard"
/>
</span>
@@ -43,7 +74,7 @@ export default {
<component
ref="titleWrapper"
:is="titleTag"
- :href="diffFile.discussionPath"
+ :href="`#${diffFile.fileHash}`"
>
<span v-html="diffFile.blobIcon"></span>
<span v-if="diffFile.renamedFile">