- Upgrade angular-strap to fix an NPE
- Start the download of the rest of the repo information after the repo itself loads
This commit is contained in:
parent
1ed814a469
commit
d9c3c6689a
4 changed files with 29 additions and 21 deletions
|
@ -1,11 +1,13 @@
|
|||
<li ng-class="tabActive == 'true' ? 'active' : ''">
|
||||
<a href="javascript:void(0)" data-title="{{ tabTitle }}"
|
||||
data-toggle="tab"
|
||||
<a href="javascript:void(0)" data-toggle="tab"
|
||||
data-target="{{ tabTarget }}"
|
||||
data-placement="right"
|
||||
data-container="body"
|
||||
ng-click="tabInit()"
|
||||
bs-tooltip>
|
||||
<span ng-transclude/>
|
||||
ng-click="tabInit()">
|
||||
<span data-title="{{ tabTitle }}"
|
||||
data-placement="right"
|
||||
data-container="body"
|
||||
style="display:inline-block"
|
||||
bs-tooltip>
|
||||
<span ng-transclude/></span>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
|
@ -13,7 +13,7 @@
|
|||
}, ['old-layout']);
|
||||
}]);
|
||||
|
||||
function RepoViewCtrl($scope, $routeParams, $location, ApiService, UserService, AngularPollChannel) {
|
||||
function RepoViewCtrl($scope, $routeParams, $location, $timeout, ApiService, UserService, AngularPollChannel) {
|
||||
$scope.namespace = $routeParams.namespace;
|
||||
$scope.name = $routeParams.name;
|
||||
|
||||
|
@ -64,11 +64,19 @@
|
|||
|
||||
$scope.repositoryResource = ApiService.getRepoAsResource(params).get(function(repo) {
|
||||
$scope.viewScope.repository = repo;
|
||||
$scope.setTags($routeParams.tag);
|
||||
|
||||
// Track builds.
|
||||
buildPollChannel = AngularPollChannel.create($scope, loadRepositoryBuilds, 5000 /* 5s */);
|
||||
buildPollChannel.start();
|
||||
// Load the remainder of the data async, so we don't block the initial view from
|
||||
// showing.
|
||||
$timeout(function() {
|
||||
$scope.setTags($routeParams.tag);
|
||||
|
||||
// Load the images.
|
||||
loadImages();
|
||||
|
||||
// Track builds.
|
||||
buildPollChannel = AngularPollChannel.create($scope, loadRepositoryBuilds, 5000 /* 5s */);
|
||||
buildPollChannel.start();
|
||||
}, 10);
|
||||
});
|
||||
};
|
||||
|
||||
|
@ -98,9 +106,8 @@
|
|||
}, errorHandler);
|
||||
};
|
||||
|
||||
// Load the repository and images.
|
||||
// Load the repository.
|
||||
loadRepository();
|
||||
loadImages();
|
||||
|
||||
$scope.setTags = function(tagNames) {
|
||||
if (!tagNames) {
|
||||
|
|
8
static/lib/angular-strap.min.js
vendored
8
static/lib/angular-strap.min.js
vendored
File diff suppressed because one or more lines are too long
5
static/lib/angular-strap.tpl.min.js
vendored
5
static/lib/angular-strap.tpl.min.js
vendored
File diff suppressed because one or more lines are too long
Reference in a new issue