From 516607551c3e06bdfe58dbccc91fc4476871cb76 Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Sun, 12 Aug 2018 19:35:59 -0400 Subject: [PATCH] show follow tip on first auto scroll hide --- awx/ui/client/features/output/constants.js | 1 + awx/ui/client/features/output/index.controller.js | 15 ++++++++++++--- awx/ui/client/features/output/index.view.html | 1 + 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/awx/ui/client/features/output/constants.js b/awx/ui/client/features/output/constants.js index 4bab4ca1bb..5d3b29aab8 100644 --- a/awx/ui/client/features/output/constants.js +++ b/awx/ui/client/features/output/constants.js @@ -15,6 +15,7 @@ export const JOB_STATUS_FINISHED = JOB_STATUS_COMPLETE.concat(JOB_STATUS_INCOMPL export const OUTPUT_ELEMENT_CONTAINER = '.at-Stdout-container'; export const OUTPUT_ELEMENT_TBODY = '#atStdoutResultTable'; +export const OUTPUT_ELEMENT_LAST = '#atStdoutMenuLast'; export const OUTPUT_MAX_LAG = 120; export const OUTPUT_ORDER_BY = 'counter'; export const OUTPUT_PAGE_CACHE = true; diff --git a/awx/ui/client/features/output/index.controller.js b/awx/ui/client/features/output/index.controller.js index 699717c285..2be373476e 100644 --- a/awx/ui/client/features/output/index.controller.js +++ b/awx/ui/client/features/output/index.controller.js @@ -2,6 +2,7 @@ import { EVENT_START_PLAY, EVENT_START_TASK, + OUTPUT_ELEMENT_LAST, OUTPUT_PAGE_SIZE, } from './constants'; @@ -485,6 +486,7 @@ function OutputIndexController ( }, }); + let showFollowTip = true; const rates = []; stream.init({ bufferAdd, @@ -494,12 +496,19 @@ function OutputIndexController ( rates.push(rate); rates.splice(0, rates.length - 5); + if (rates.every(value => value === 1)) { + scroll.unlock(); + scroll.unhide(); + } + if (rate > 1 && vm.isFollowing) { scroll.lock(); scroll.hide(); - } else if (rates.every(value => value === 1)) { - scroll.unlock(); - scroll.unhide(); + + if (showFollowTip) { + showFollowTip = false; + $(OUTPUT_ELEMENT_LAST).trigger('mouseenter'); + } } }, onStop () { diff --git a/awx/ui/client/features/output/index.view.html b/awx/ui/client/features/output/index.view.html index 08df5f714a..738b7a0ae5 100644 --- a/awx/ui/client/features/output/index.view.html +++ b/awx/ui/client/features/output/index.view.html @@ -28,6 +28,7 @@