diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 18:09:01 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 18:09:01 +0300 |
commit | b304a72312465ed4c0a568ee6a6ea5e97f705c9b (patch) | |
tree | a2f25dbea26c81e88b169c55a6275e3969323e82 /app/assets/javascripts/vue_shared/components/file_row.vue | |
parent | b84eeb256c4a780d902faee1f99ca9a711b3214a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/file_row.vue')
-rw-r--r-- | app/assets/javascripts/vue_shared/components/file_row.vue | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/app/assets/javascripts/vue_shared/components/file_row.vue b/app/assets/javascripts/vue_shared/components/file_row.vue index d962f644ff8..1ea6eb2628b 100644 --- a/app/assets/javascripts/vue_shared/components/file_row.vue +++ b/app/assets/javascripts/vue_shared/components/file_row.vue @@ -1,5 +1,4 @@ <script> -import Icon from '~/vue_shared/components/icon.vue'; import FileHeader from '~/vue_shared/components/file_row_header.vue'; import FileIcon from '~/vue_shared/components/file_icon.vue'; import ChangedFileIcon from '~/vue_shared/components/changed_file_icon.vue'; @@ -9,7 +8,6 @@ export default { components: { FileHeader, FileIcon, - Icon, ChangedFileIcon, }, props: { @@ -21,27 +19,12 @@ export default { type: Number, required: true, }, - extraComponent: { - type: Object, - required: false, - default: null, - }, - hideExtraOnTree: { - type: Boolean, - required: false, - default: false, - }, showChangedIcon: { type: Boolean, required: false, default: false, }, }, - data() { - return { - dropdownOpen: false, - }; - }, computed: { isTree() { return this.file.type === 'tree'; @@ -120,9 +103,6 @@ export default { return this.$router.currentRoute.path === `/project${this.file.url}`; }, - toggleDropdown(val) { - this.dropdownOpen = val; - }, }, }; </script> @@ -136,7 +116,7 @@ export default { class="file-row" role="button" @click="clickFile" - @mouseleave="toggleDropdown(false)" + @mouseleave="$emit('mouseleave', $event)" > <div class="file-row-name-container"> <span ref="textOutput" :style="levelIndentation" class="file-row-name str-truncated"> @@ -152,13 +132,7 @@ export default { <changed-file-icon v-else :file="file" :size="16" class="append-right-5" /> {{ file.name }} </span> - <component - :is="extraComponent" - v-if="extraComponent && !(hideExtraOnTree && file.type === 'tree')" - :file="file" - :dropdown-open="dropdownOpen" - @toggle="toggleDropdown($event)" - /> + <slot></slot> </div> </div> </template> |