diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 15:09:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 15:09:21 +0300 |
| commit | 09b4875c004d2db76b15cb0b32e7a7e623bbfa6f (patch) | |
| tree | ed34a2d9267c31a22623e37e8cfc0ca009e59e2b /app/assets/javascripts/sidebar | |
| parent | 19e00b948726c0f7ca27dd92200493803499a4e1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/sidebar')
| -rw-r--r-- | app/assets/javascripts/sidebar/components/labels/labels_select_vue/labels_select_root.vue | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/sidebar/components/labels/labels_select_vue/labels_select_root.vue b/app/assets/javascripts/sidebar/components/labels/labels_select_vue/labels_select_root.vue index 2a78db352d7..04c62c99a11 100644 --- a/app/assets/javascripts/sidebar/components/labels/labels_select_vue/labels_select_root.vue +++ b/app/assets/javascripts/sidebar/components/labels/labels_select_vue/labels_select_root.vue @@ -1,5 +1,4 @@ <script> -import $ from 'jquery'; import Vue from 'vue'; import Vuex, { mapState, mapActions, mapGetters } from 'vuex'; import { isInViewport } from '~/lib/utils/common_utils'; @@ -260,8 +259,8 @@ export default { target?.parentElement?.classList.contains(className), ); - const hasExceptionParent = ['.js-btn-back', '.js-labels-list'].some( - (className) => $(target).parents(className).length, + const hasExceptionParent = ['.js-btn-back', '.js-labels-list'].some((className) => + target?.closest(className), ); const isInDropdownButtonCollapsed = this.$refs.dropdownButtonCollapsed?.$el.contains(target); |