diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-27 00:09:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-27 00:09:22 +0300 |
commit | 8e28b42532fa7c0c6f33113187d7378a1e48a1c6 (patch) | |
tree | f6a10ef1d6d4de53e9b3e261608e931942a02af1 /app/assets/javascripts/lib | |
parent | 08931747cc2092734a794980ef13ff67e89a9d8b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/lib')
-rw-r--r-- | app/assets/javascripts/lib/utils/common_utils.js | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/app/assets/javascripts/lib/utils/common_utils.js b/app/assets/javascripts/lib/utils/common_utils.js index ef25fd83db9..f88a0433535 100644 --- a/app/assets/javascripts/lib/utils/common_utils.js +++ b/app/assets/javascripts/lib/utils/common_utils.js @@ -218,26 +218,36 @@ export const isMetaKey = e => e.metaKey || e.ctrlKey || e.altKey || e.shiftKey; export const isMetaClick = e => e.metaKey || e.ctrlKey || e.which === 2; export const contentTop = () => { + const isDesktop = breakpointInstance.isDesktop(); const heightCalculators = [ () => $('#js-peek').outerHeight(), () => $('.navbar-gitlab').outerHeight(), + ({ desktop }) => { + const container = document.querySelector('.line-resolve-all-container'); + let size = 0; + + if (!desktop && container) { + size = container.offsetHeight; + } + + return size; + }, () => $('.merge-request-tabs').outerHeight(), () => $('.js-diff-files-changed').outerHeight(), - () => { - const isDesktop = breakpointInstance.isDesktop(); + ({ desktop }) => { const diffsTabIsActive = window.mrTabs?.currentAction === 'diffs'; let size; - if (isDesktop && diffsTabIsActive) { + if (desktop && diffsTabIsActive) { size = $('.diff-file .file-title-flex-parent:visible').outerHeight(); } return size; }, - () => { + ({ desktop }) => { let size; - if (breakpointInstance.isDesktop()) { + if (desktop) { size = $('.mr-version-controls').outerHeight(); } @@ -246,7 +256,7 @@ export const contentTop = () => { ]; return heightCalculators.reduce((totalHeight, calculator) => { - return totalHeight + (calculator() || 0); + return totalHeight + (calculator({ desktop: isDesktop }) || 0); }, 0); }; |