vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of ssh://bitbucket.org/yackob03/quay

Browse source
This commit is contained in:
jakedt 2014-03-05 16:33:29 -05:00
commit 63bfde1036
8 changed files with 51 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
static/js/app.js
View file

@ -2672,7 +2672,8 @@ quayApp.directive('triggerDescription', function () {
transclude: false,
restrict: 'C',
scope: {
'trigger': '=trigger'
'trigger': '=trigger',
'short': '=short'
},
controller: function($scope, $element) {
}

25
static/js/controllers.js
View file

@ -816,9 +816,23 @@ function BuildPackageCtrl($scope, Restangular, ApiService, $routeParams, $rootSc
// itself (should) be the Dockerfile.
if (zipFiles && Object.keys(zipFiles).length) {
// Load the dockerfile contents.
var dockerfile = zip.file('Dockerfile');
var dockerfilePath = 'Dockerfile';
if ($scope.repobuild['job_config']) {
var dockerfileFolder = ($scope.repobuild['job_config']['build_subdir'] || '');
if (dockerfileFolder[0] == '/') {
dockerfileFolder = dockerfileFolder.substr(1);
}
if (dockerfileFolder[dockerfileFolder.length - 1] == '/') {
dockerfileFolder = dockerfileFolder.substr(0, dockerfileFolder.length - 1);
}
dockerfilePath = dockerfileFolder + 'Dockerfile';
}
var dockerfile = zip.file(dockerfilePath);
if (dockerfile) {
$scope.dockerFileContents = dockerfile.asText();
$scope.dockerFilePath = dockerfilePath;
}
// Build the zip file tree.
@ -833,6 +847,7 @@ function BuildPackageCtrl($scope, Restangular, ApiService, $routeParams, $rootSc
});
} else {
$scope.dockerFileContents = response;
$scope.dockerFilePath = 'Dockerfile';
}
$scope.loaded = true;
@ -951,8 +966,14 @@ function RepoBuildCtrl($scope, Restangular, ApiService, $routeParams, $rootScope
$scope.restartBuild = function(build) {
$('#confirmRestartBuildModal').modal('hide');
var subdirectory = '';
if (build['job_config']) {
subdirectory = build['job_config']['build_subdir'] || '';
}
var data = {
'file_id': build['resource_key']
'file_id': build['resource_key'],
'subdirectory': subdirectory
};
var params = {

3
static/js/graphing.js
View file

@ -851,7 +851,8 @@ function FileTreeBase() {
* Calculates the dimensions of the tree.
*/
FileTreeBase.prototype.calculateDimensions_ = function(container) {
var cw = document.getElementById(container).clientWidth;
var containerElm = document.getElementById(container);
var cw = containerElm ? containerElm.clientWidth : 1200;
var barHeight = 20;
var ch = (this.getNodesHeight() * barHeight) + 40;