Commit 8d7d6bcb authored by Kushal Pandya's avatar Kushal Pandya

Fix rebase conflicts

parent 407c90be
...@@ -179,7 +179,6 @@ ...@@ -179,7 +179,6 @@
if ($autoScrollContainer.length) { // Show and Reposition Autoscroll Status Message if ($autoScrollContainer.length) { // Show and Reposition Autoscroll Status Message
$autoScrollContainer.show().css({ top: $body.outerHeight() - 75 }); $autoScrollContainer.show().css({ top: $body.outerHeight() - 75 });
<<<<<<< fbd5f4507b310d6dc1305696851e9860b48fa0ba
} }
} }
...@@ -196,24 +195,6 @@ ...@@ -196,24 +195,6 @@
// Check if Refresh Animation is in Viewport and enable Autoscroll, disable otherwise. // Check if Refresh Animation is in Viewport and enable Autoscroll, disable otherwise.
$autoScrollStatus.data("state", isInViewport($('.js-build-refresh')) ? 'enabled' : 'disabled'); $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() { Build.prototype.shouldHideSidebarForViewport = function() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment