diff options
| author | Kushal Pandya <kushal@gitlab.com> | 2016-12-13 21:21:13 +0530 |
|---|---|---|
| committer | Kushal Pandya <kushal@gitlab.com> | 2016-12-21 13:16:18 +0530 |
| commit | 3f2fd48c7cdcbefc4d26b5b45c9150433d394271 (patch) | |
| tree | e45bddd40a36f6df89d4a98176b6bb6143da263f | |
| parent | cc62a416560267d4a87b823faa333bcdaa5867b4 (diff) | |
| download | gitlab-ce-3f2fd48c7cdcbefc4d26b5b45c9150433d394271.tar.gz | |
Prevent scroll bottom button and scroll indicator clashes
| -rw-r--r-- | app/assets/javascripts/build.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/assets/javascripts/build.js b/app/assets/javascripts/build.js index 81149a427dc..c3cbd07ae21 100644 --- a/app/assets/javascripts/build.js +++ b/app/assets/javascripts/build.js @@ -180,6 +180,9 @@ } else if (gl.utils.isInViewport(this.$upBuildTrace[0]) && !gl.utils.isInViewport(this.$downBuildTrace[0])) { // User is at Top of Build Log this.$scrollTopBtn.hide(); this.$scrollBottomBtn.show(); + + this.$autoScrollContainer.hide(); + this.$autoScrollStatusText.removeClass('animate'); } else if ((!gl.utils.isInViewport(this.$upBuildTrace[0]) && gl.utils.isInViewport(this.$downBuildTrace[0])) || gl.utils.isInViewport(this.$buildRefreshAnimation[0])) { // User is at Bottom of Build Log this.$scrollTopBtn.show(); |