diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-08 21:09:32 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-08 21:09:32 +0300 |
| commit | 7e17b031fa8e57a698fc474ded12eaa2553c87f5 (patch) | |
| tree | d753ae5527f835901f86a30608c024e86e11fbaa /app/assets/javascripts/vue_shared/components/file_finder | |
| parent | 66a3180a3b9417cb5259ecca83934f22b136394b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/file_finder')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/file_finder/index.vue | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_shared/components/file_finder/index.vue b/app/assets/javascripts/vue_shared/components/file_finder/index.vue index fbadb202d51..b0c1c1531aa 100644 --- a/app/assets/javascripts/vue_shared/components/file_finder/index.vue +++ b/app/assets/javascripts/vue_shared/components/file_finder/index.vue @@ -103,6 +103,9 @@ export default { focusedIndex() { if (!this.mouseOver) { this.$nextTick(() => { + if (!this.$refs.virtualScrollList?.$el) { + return; + } const el = this.$refs.virtualScrollList.$el; const scrollTop = this.focusedIndex * FILE_FINDER_ROW_HEIGHT; const bottom = this.listShowCount * FILE_FINDER_ROW_HEIGHT; @@ -218,7 +221,7 @@ export default { </script> <template> - <div class="file-finder-overlay" @mousedown.self="toggle(false)"> + <div v-if="visible" class="file-finder-overlay" @mousedown.self="toggle(false)"> <div class="dropdown-menu diff-file-changes file-finder show"> <div :class="{ 'has-value': showClearInputButton }" class="dropdown-input"> <input |