From d34bf8675d367b3211c2da999bd113d046260777 Mon Sep 17 00:00:00 2001 From: Chris Houseknecht Date: Thu, 3 Jul 2014 14:46:14 -0400 Subject: [PATCH] Jobstdout bug fix Forced scroll to bottom during live event processing fixed. Bottom spinner right margin fixed. --- awx/ui/static/js/controllers/JobStdout.js | 2 +- awx/ui/static/less/stdout.less | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/awx/ui/static/js/controllers/JobStdout.js b/awx/ui/static/js/controllers/JobStdout.js index 715a02070f..2bbe06623f 100644 --- a/awx/ui/static/js/controllers/JobStdout.js +++ b/awx/ui/static/js/controllers/JobStdout.js @@ -213,7 +213,7 @@ function JobStdoutController ($log, $rootScope, $scope, $compile, $routeParams, // if user has not disabled live event view by scrolling upward, then scroll down to the new content current_range = data.range; auto_scroll_down = true; // prevent auto load from happening - $('#pre-container-content').scrollTop($('#pre-container-content').prop("scrollHeight")); + $('#pre-container').scrollTop($('#pre-container').prop("scrollHeight")); } $('#stdoutMoreRowsBottom').fadeOut(400); }) diff --git a/awx/ui/static/less/stdout.less b/awx/ui/static/less/stdout.less index 2f523f8405..d85e1c1a8c 100644 --- a/awx/ui/static/less/stdout.less +++ b/awx/ui/static/less/stdout.less @@ -27,6 +27,7 @@ } #stdoutMoreRowsBottom { float: right; + padding-right: 15px; } #pre-container { overflow-x: scroll;