darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

quick fix for reloading page if succesfully started a rebuild of a commit

Browse source
This commit is contained in:
Eichin David 2014-10-25 21:34:27 +02:00
parent c364b9c13f
commit 2d74e4ed04
1 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
server/app/scripts/app.js
View file

@ -226,7 +226,7 @@ app.controller("AccountReposController", function($scope, $http, user) {
}); });
app.controller("CommitController", function($scope, $http, $routeParams, stdout, feed) { app.controller("CommitController", function($scope, $http, $route, $routeParams, stdout, feed) {
var remote = $routeParams.remote; var remote = $routeParams.remote;
var owner = $routeParams.owner; var owner = $routeParams.owner;
@ -235,11 +235,29 @@ app.controller("CommitController", function($scope, $http, $routeParams, stdout,
var commit = $routeParams.commit; var commit = $routeParams.commit;
$scope.console=''; $scope.console='';
var handleOutput = function(id, clearConsole) {
var lineFormatter = new Drone.LineFormatter();
var el = document.querySelector('#output');
if(clearConsole === true) {
el.innerHTML = '';
}
stdout.subscribe(id, function(out){
angular.element(el).append(lineFormatter.format(out));
if ($scope.following) {
window.scrollTo(0, document.body.scrollHeight);
}
});
}
feed.subscribe(function(item) { feed.subscribe(function(item) {
if (item.commit.sha == commit && if (item.commit.sha == commit &&
item.commit.branch == branch) { item.commit.branch == branch) {
if(item.commit.status == "Started") {
handleOutput(item.commit.id, true);
}
$scope.commit = item.commit; $scope.commit = item.commit;
$scope.$apply(); $scope.$apply();
} else { } else {
// we trigger an toast notification so the // we trigger an toast notification so the
// user is aware another build started // user is aware another build started
@ -274,14 +292,8 @@ app.controller("CommitController", function($scope, $http, $routeParams, stdout,
return; return;
} }
var lineFormatter = new Drone.LineFormatter(); handleOutput(data.id, false);
var el = document.querySelector('#output');
stdout.subscribe(data.id, function(out){
angular.element(el).append(lineFormatter.format(out));
if ($scope.following) {
window.scrollTo(0, document.body.scrollHeight);
}
});
}). }).
error(function(data, status, headers, config) { error(function(data, status, headers, config) {
console.log(data); console.log(data);
@ -297,7 +309,7 @@ app.controller("CommitController", function($scope, $http, $routeParams, stdout,
} }
$scope.rebuildCommit = function() { $scope.rebuildCommit = function() {
$http({method: 'POST', url: '/api/repos/'+remote+'/'+owner+'/'+name+'/'+'branches/'+branch+'/'+'commits/'+commit+'?action=rebuild' }) $http({method: 'POST', url: '/api/repos/'+remote+'/'+owner+'/'+name+'/'+'branches/'+branch+'/'+'commits/'+commit+'?action=rebuild' });
} }