diff options
| author | Jose <jvargas@gitlab.com> | 2018-05-30 10:18:18 -0500 |
|---|---|---|
| committer | Jose <jvargas@gitlab.com> | 2018-06-01 11:41:42 -0500 |
| commit | 7644edd8aae6d2959790f35302d3f0ec5767097d (patch) | |
| tree | cf93b2c9b36332c3488a398d4e757cde2adfc275 | |
| parent | 43e08b1a38abdb552e4f3d4feee9a898b90d8db2 (diff) | |
| download | gitlab-ce-jivl-backport-scroll-utilities.tar.gz | |
Add partial for the build outputsjivl-backport-scroll-utilities
| -rw-r--r-- | app/assets/javascripts/job.js | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/lib/utils/scroll_utils.js | 3 | ||||
| -rw-r--r-- | app/views/projects/jobs/show.html.haml | 4 | ||||
| -rw-r--r-- | app/views/shared/builds/_build_output.html.haml | 3 | ||||
| -rw-r--r-- | qa/qa/page/project/job/show.rb | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/app/assets/javascripts/job.js b/app/assets/javascripts/job.js index 83c38173a1c..295162a9ad5 100644 --- a/app/assets/javascripts/job.js +++ b/app/assets/javascripts/job.js @@ -32,10 +32,6 @@ export default class Job extends LogOutputBehaviours { this.$buildTraceOutput = $('.js-build-output'); this.$topBar = $('.js-top-bar'); - // Scroll controllers - this.$scrollTopBtn = $('.js-scroll-up'); - this.$scrollBottomBtn = $('.js-scroll-down'); - clearTimeout(this.timeout); this.initSidebar(); diff --git a/app/assets/javascripts/lib/utils/scroll_utils.js b/app/assets/javascripts/lib/utils/scroll_utils.js index b31a8c38550..9313b570863 100644 --- a/app/assets/javascripts/lib/utils/scroll_utils.js +++ b/app/assets/javascripts/lib/utils/scroll_utils.js @@ -2,6 +2,9 @@ import $ from 'jquery'; export const canScroll = () => $(document).height() > $(window).height(); +/** + * Checks if the entire page is scrolled down all the way to the bottom + */ export const isScrolledToBottom = () => { const $document = $(document); diff --git a/app/views/projects/jobs/show.html.haml b/app/views/projects/jobs/show.html.haml index ec9a04c0eab..1f33bb3a129 100644 --- a/app/views/projects/jobs/show.html.haml +++ b/app/views/projects/jobs/show.html.haml @@ -86,9 +86,7 @@ %button.js-scroll-down.btn-scroll.btn-transparent.btn-blank{ type: 'button', disabled: true } = custom_icon('scroll_down') - %pre.build-trace#build-trace - %code.bash.js-build-output - .build-loader-animation.js-build-refresh + = render 'shared/builds/build_output' - else = render "empty_states" diff --git a/app/views/shared/builds/_build_output.html.haml b/app/views/shared/builds/_build_output.html.haml new file mode 100644 index 00000000000..07f1501fadd --- /dev/null +++ b/app/views/shared/builds/_build_output.html.haml @@ -0,0 +1,3 @@ +%pre.build-trace#build-trace + %code.bash.js-build-output + .build-loader-animation.js-build-refresh diff --git a/qa/qa/page/project/job/show.rb b/qa/qa/page/project/job/show.rb index 83bb224b5c3..f1a859fd8ee 100644 --- a/qa/qa/page/project/job/show.rb +++ b/qa/qa/page/project/job/show.rb @@ -4,7 +4,7 @@ module QA::Page COMPLETED_STATUSES = %w[passed failed canceled blocked skipped manual].freeze # excludes created, pending, running PASSED_STATUS = 'passed'.freeze - view 'app/views/projects/jobs/show.html.haml' do + view 'app/views/shared/builds/_build_output.html.haml' do element :build_output, '.js-build-output' end |