adjust scrollToElement to account for fixed merge request tabs

54a794f2 · Mike Greiling · c434568f · 54a794f2
Commit 54a794f2 authored Nov 10, 2016 by Mike Greiling
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

app/assets/javascripts/merge_request_tabs.js.es6 app/assets/javascripts/merge_request_tabs.js.es6 +7 -5

No files found.
--- a/app/assets/javascripts/merge_request_tabs.js.es6
+++ b/app/assets/javascripts/merge_request_tabs.js.es6
@@ -135,12 +135,14 @@
    scrollToElement(container) {
      if (location.hash) {
-        const navBarHeight = $('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight() + document.querySelector('.js-tabs-affix').offsetHeight;
+        const offset = 0 - (
+          $('.navbar-gitlab').outerHeight() +
+          $('.layout-nav').outerHeight() +
+          $('.js-tabs-affix').outerHeight()
+        );
        const $el = $(`${container} ${location.hash}:not(.match)`);
-        if ($el.length) {
+        if ($el.length > 0) {
-          $.scrollTo($el[0], {
+          $.scrollTo($el[0], { offset });
-            offset: -navBarHeight,
-          });
        }
      }
    }