Use gl.utils.isInViewport and improve gl.utils.animateToElement.

1 files changed, 11 insertions, 12 deletions

diff --git a/app/assets/javascripts/lib/utils/common_utils.js b/app/assets/javascripts/lib/utils/common_utils.js
index 31332cbe488..7bf62cfd927 100644
--- a/app/assets/javascripts/lib/utils/common_utils.js
+++ b/app/assets/javascripts/lib/utils/common_utils.js
@@ -128,18 +128,17 @@
       return e.metaKey || e.ctrlKey || e.altKey || e.shiftKey;
     };
 
-  })(window);
+    gl.utils.animateToElement = function($el) {
+      var top = $el.offset().top;
+      gl.navBarHeight = gl.navBarHeight || $('.navbar-gitlab').height();
+      gl.navLinksHieght = gl.navLinksHieght || $('.nav-links').height();
+      gl.mrTabsHeight = gl.mrTabsHeight || $('.merge-request-tabs').height();
+
+      return $('body, html').animate({
+        scrollTop: top - (gl.navBarHeight + gl.navLinksHieght + gl.mrTabsHeight)
+      }, 200);
+    };
 
-  gl.utils.isElementVisibleInViewport = function(el) {
-    var rect = el.getBoundingClientRect();
-    var height = Math.max(document.documentElement.clientHeight, window.innerHeight);
-    return !(rect.bottom - 110 < 0 || rect.top - height >= 0); // -110 for sticky GitLab navigation header
-  };
-
-  gl.utils.animateToElement = function($el) {
-    return $('body, html').animate({
-      scrollTop: $el.offset().top - 110
-    }, 200);
-  };
+  })(window);
 
 }).call(this);