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

Fix NPE and other small issues with the new image view

Browse source
This commit is contained in:
Joseph Schorr 2015-03-24 19:28:24 -04:00
parent 3d44416016
commit 0d98776d54
4 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
external_libraries.py
View file

@ -21,7 +21,7 @@ EXTERNAL_CSS = [
'netdna.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.css', 'netdna.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.css',
'netdna.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css', 'netdna.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css',
'fonts.googleapis.com/css?family=Source+Sans+Pro:400,700', 'fonts.googleapis.com/css?family=Source+Sans+Pro:400,700',
'cdn.core-os.net/icons/core-icons.css' 's3.amazonaws.com/cdn.core-os.net/icons/core-icons.css'
] ]
EXTERNAL_FONTS = [ EXTERNAL_FONTS = [

7
static/js/graphing.js
View file

@ -1157,8 +1157,11 @@ FileTreeBase.prototype.populateAndDraw_ = function() {
} }
this.root_ = this.nodeMap_['']; this.root_ = this.nodeMap_[''];
this.root_.x0 = 0; if (this.root_) {
this.root_.y0 = 0; this.root_.x0 = 0;
this.root_.y0 = 0;
}
this.toggle_(this.root_); this.toggle_(this.root_);
this.update_(this.root_); this.update_(this.root_);
}; };

2
static/js/pages/image-view.js
View file

@ -73,7 +73,7 @@
}; };
$scope.initializeTree = function() { $scope.initializeTree = function() {
if ($scope.tree) { return; } if ($scope.tree || !$scope.combinedChanges.length) { return; }
$scope.tree = new ImageFileChangeTree($scope.image, $scope.combinedChanges); $scope.tree = new ImageFileChangeTree($scope.image, $scope.combinedChanges);
$timeout(function() { $timeout(function() {

13
static/partials/image-view.html
View file

@ -40,8 +40,17 @@
<div id="changes" class="tab-pane"> <div id="changes" class="tab-pane">
<div class="resource-view" resource="changesResource" error-message="'Could not load image changes'"> <div class="resource-view" resource="changesResource" error-message="'Could not load image changes'">
<h3>Image File Changes</h3> <h3>Image File Changes</h3>
<div id="changes-tree-container" class="changes-container" <div class="empty" ng-if="!combinedChanges.length">
onresize="tree && tree.notifyResized()"></div> <div class="empty-primary-msg">No file changes</div>
<div class="empty-secondary-msg">
There were no file system changes in this image layer.
</div>
</div>
<div ng-show="combinedChanges.length">
<div id="changes-tree-container" class="changes-container"
onresize="tree && tree.notifyResized()"></div>
</div>
</div> </div>
</div> </div>
</div> </div>