zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-06 00:11:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Job stdout scrolling

Browse Source 
Started adding bits to detect when user scrolls up. When that happens stop showing live events.
This commit is contained in:
Chris Houseknecht
2014-06-26 11:01:42 -04:00
parent 7ecbe727ca
commit 745eb00b3f
5 changed files with 24 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
awx/ui/static/js/controllers/JobStdout.js
View File

@@ -21,6 +21,7 @@ function JobStdoutController ($log, $rootScope, $scope, $compile, $routeParams,
event_queue = 0,
auto_scroll_down=true,
live_event_processing = true,
should_apply_live_events = true,
page_size = 500;
event_socket = Socket({
@@ -51,7 +52,7 @@ function JobStdoutController ($log, $rootScope, $scope, $compile, $routeParams,
if ($rootScope.jobStdOutInterval) {
window.clearInterval($rootScope.jobStdOutInterval);
}
if (live_event_processing) {
if (live_event_processing && should_apply_live_events) {
getNextSection();
}
live_event_processing = false;
@@ -61,8 +62,8 @@ function JobStdoutController ($log, $rootScope, $scope, $compile, $routeParams,
$rootScope.jobStdOutInterval = setInterval( function() {
// limit the scrolling to every 5 seconds
$log.debug('checking for stdout...');
if (event_queue > 15) {
if (event_queue > 5) {
$log.debug('checking for stdout...');
if (loaded_sections.length === 0) {
$log.debug('calling LoadStdout');
$scope.$emit('LoadStdout');
@@ -73,7 +74,7 @@ function JobStdoutController ($log, $rootScope, $scope, $compile, $routeParams,
}
event_queue = 0;
}
}, 5000);
}, 1500);
if ($scope.removeLoadStdout) {
$scope.removeLoadStdout();
@@ -121,6 +122,9 @@ function JobStdoutController ($log, $rootScope, $scope, $compile, $routeParams,
stdout_url = data.related.stdout;
if (data.status === 'successful' || data.status === 'failed' || data.status === 'error' || data.status === 'canceled') {
live_event_processing = false;
if ($rootScope.jobStdOutInterval) {
window.clearInterval($rootScope.jobStdOutInterval);
}
}
$scope.$emit('LoadStdout');
})
@@ -190,8 +194,15 @@ function JobStdoutController ($log, $rootScope, $scope, $compile, $routeParams,
}
};
$scope.scrollStarted = function() {
// user touched the scroll bar. stop applying live events and forcing
should_apply_live_events = false;
$log.debug('turned off live events');
};
function getNextSection() {
var start = current_range.end + 1, url;
should_apply_live_events = true; //user scrolled all the way to bottom. if there are live events, start applying them
if (loaded_sections.indexOf(start) < 0) {
url = stdout_url + '?format=json&start_line=' + start + '&end_line=' + (current_range.start + page_size);
Wait('start');