From 60a43015e2d5452af92001a44ce530403d7455ed Mon Sep 17 00:00:00 2001
From: gconsidine <greg@gregconsidine.com>
Date: Thu, 22 Feb 2018 15:45:09 -0500
Subject: [PATCH] Update when scroll,stream flags are flipped

---
 awx/ui/client/features/jobs/_index.less         |  3 +--
 .../client/features/output/index.controller.js  | 17 +++++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/awx/ui/client/features/jobs/_index.less b/awx/ui/client/features/jobs/_index.less
index 623db07cc6..d661afae97 100644
--- a/awx/ui/client/features/jobs/_index.less
+++ b/awx/ui/client/features/jobs/_index.less
@@ -1,6 +1,4 @@
 .at-Stdout {
-    font-family: monospace;
-
     &-menuTop {
         color: @at-gray-848992;
         border: 1px solid @at-gray-b7;
@@ -123,6 +121,7 @@
     }
 
     &-container {
+        font-family: monospace;
         height: calc(~"100vh - 240px");
         overflow-y: scroll;
         font-size: 15px;
diff --git a/awx/ui/client/features/output/index.controller.js b/awx/ui/client/features/output/index.controller.js
index 71db68d5b4..66f3171dd7 100644
--- a/awx/ui/client/features/output/index.controller.js
+++ b/awx/ui/client/features/output/index.controller.js
@@ -115,6 +115,12 @@ function processWebSocketEvents (scope, data) {
         vm.stream.isActive = false;
     }
 
+    if (!vm.scroll.isLocked) {
+        vm.scroll.isActive = false;
+
+        return;
+    }
+
     if (vm.stream.count % resource.page.size === 0) {
         cache.push({
             page: vm.stream.page
@@ -153,12 +159,11 @@ function render (events) {
                     events = buffer.slice(0, buffer.length);
                     buffer = [];
 
-                    return render(events)
-                        .then(() => {
-                            vm.stream.isRendering = false;
-                            vm.scroll.isLocked = false;
-                            vm.scroll.isActive = false;
-                        });
+                    return render(events);
+                } else {
+                    vm.stream.isRendering = false;
+                    vm.scroll.isLocked = false;
+                    vm.scroll.isActive = false;
                 }
             } else {
                 vm.stream.isRendering = false;