diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-19 15:10:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-19 15:10:09 +0300 |
commit | 690c904b5e340f14c04f93ff688b647b46f7d1a2 (patch) | |
tree | 1eeb0005de86a16132fc08608494a67d5b9f4f71 /app/assets/javascripts/merge_request_tabs.js | |
parent | 035cd5ee5e42fda4a896ed43147ebf455fa2f5ba (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/merge_request_tabs.js')
-rw-r--r-- | app/assets/javascripts/merge_request_tabs.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index 94041d77bb0..ed2e6a5af58 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -177,7 +177,7 @@ export default class MergeRequestTabs { this.peek = document.getElementById('js-peek'); this.sidebar = document.querySelector('.js-right-sidebar'); this.pageLayout = document.querySelector('.layout-page'); - this.expandSidebar = document.querySelector('.js-expand-sidebar'); + this.expandSidebar = document.querySelectorAll('.js-expand-sidebar, .js-sidebar-toggle'); this.paddingTop = 16; this.scrollPositions = {}; @@ -282,7 +282,11 @@ export default class MergeRequestTabs { const tab = this.mergeRequestTabs.querySelector(`.${action}-tab`); if (tab) tab.classList.add('active'); - this.expandSidebar?.classList.toggle('gl-display-none!', action !== 'show'); + if (window.gon?.features?.movedMrSidebar) { + this.expandSidebar?.forEach((el) => + el.classList.toggle('gl-display-none!', action !== 'show'), + ); + } if (action === 'commits') { this.loadCommits(href); |