External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-14 19:30:39 -03:30
Code Issues Packages Projects Releases Wiki Activity

Update when scroll,stream flags are flipped

Browse Source
This commit is contained in:
gconsidine 2018-02-22 15:45:09 -05:00 committed by Jake McDermott
parent 5c3cf83d08
commit 60a43015e2
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/client/features/jobs/_index.less
View File

@ -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;

17
awx/ui/client/features/output/index.controller.js
View File

@ -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;