diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-26 12:09:57 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-26 12:09:57 +0300 |
commit | e48c28ed86567f049865a590fdda4569a760ee1f (patch) | |
tree | 9925303b549d10a8df95d525495e37c03991f3db /app/assets/javascripts/right_sidebar.js | |
parent | a2c7a6bbd5550fa5c0cbc8b9a55b0a828f0e6d37 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/right_sidebar.js')
-rw-r--r-- | app/assets/javascripts/right_sidebar.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/right_sidebar.js b/app/assets/javascripts/right_sidebar.js index 381421cdc23..3c8533dd06d 100644 --- a/app/assets/javascripts/right_sidebar.js +++ b/app/assets/javascripts/right_sidebar.js @@ -3,6 +3,7 @@ import $ from 'jquery'; import Cookies from 'js-cookie'; import { hide, fixTitle } from '~/tooltips'; +import { DEBOUNCE_DROPDOWN_DELAY } from '~/vue_shared/components/sidebar/labels_select_widget/constants'; import createFlash from './flash'; import axios from './lib/utils/axios_utils'; import { sprintf, s__, __ } from './locale'; @@ -130,8 +131,10 @@ Sidebar.prototype.openDropdown = function (blockOrName) { // Wait for the sidebar to trigger('click') open // so it doesn't cause our dropdown to close preemptively setTimeout(() => { - $block.find('.js-sidebar-dropdown-toggle').trigger('click'); - }); + if (!gon.features?.labelsWidget && !$block.hasClass('labels-select-wrapper')) { + $block.find('.js-sidebar-dropdown-toggle').trigger('click'); + } + }, DEBOUNCE_DROPDOWN_DELAY); }; Sidebar.prototype.setCollapseAfterUpdate = function ($block) { |