diff options
| author | Kushal Pandya <kushal@gitlab.com> | 2016-12-06 15:04:42 +0530 |
|---|---|---|
| committer | Kushal Pandya <kushal@gitlab.com> | 2016-12-21 13:16:17 +0530 |
| commit | 8d7d6bcbd02020ea4b75cb4cec31dfd4b2b6292b (patch) | |
| tree | 8d114091f1b1fcc60a0714c9afacc2742426ab5c | |
| parent | 407c90bebf09fb0668940ba93ddec875a4644116 (diff) | |
| download | gitlab-ce-8d7d6bcbd02020ea4b75cb4cec31dfd4b2b6292b.tar.gz | |
Fix rebase conflicts
| -rw-r--r-- | app/assets/javascripts/build.js | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/app/assets/javascripts/build.js b/app/assets/javascripts/build.js index e435ff90075..fc4b4aeb73c 100644 --- a/app/assets/javascripts/build.js +++ b/app/assets/javascripts/build.js @@ -179,7 +179,6 @@ if ($autoScrollContainer.length) { // Show and Reposition Autoscroll Status Message $autoScrollContainer.show().css({ top: $body.outerHeight() - 75 }); -<<<<<<< fbd5f4507b310d6dc1305696851e9860b48fa0ba } } @@ -196,24 +195,6 @@ // Check if Refresh Animation is in Viewport and enable Autoscroll, disable otherwise. $autoScrollStatus.data("state", isInViewport($('.js-build-refresh')) ? 'enabled' : 'disabled'); } -======= - } - } - - if (!isInViewport($upBuildTrace) && !isInViewport($downBuildTrace)) { // User is somewhere in middle of Build Log - $scrollTopBtn.show().addClass('sticky'); - $scrollBottomBtn.show().addClass('sticky'); - - if ($autoScrollContainer.length) { - $autoScrollContainer.hide(); - } - } - - if (this.buildStatus === "running" || this.buildStatus === "pending") { - // Check if Refresh Animation is in Viewport and enable Autoscroll, disable otherwise. - $autoScrollStatus.data("state", isInViewport($('.js-build-refresh')) ? 'enabled' : 'disabled'); - } ->>>>>>> Improve isInViewport impl, autoscroll behavior }; Build.prototype.shouldHideSidebarForViewport = function() { |