Merge remote-tracking branch 'origin/master' into umask
Conflicts: initdb.py test/data/test.db
This commit is contained in:
commit
459f30c123
46 changed files with 78463 additions and 7 deletions
|
@ -26,7 +26,7 @@ if (!Function.prototype.bind) {
|
|||
}
|
||||
|
||||
var DEPTH_HEIGHT = 100;
|
||||
var DEPTH_WIDTH = 132;
|
||||
var DEPTH_WIDTH = 140;
|
||||
|
||||
/**
|
||||
* Based off of http://mbostock.github.io/d3/talk/20111018/tree.html by Mike Bostock (@mbostock)
|
||||
|
@ -387,7 +387,7 @@ ImageHistoryTree.prototype.buildRoot_ = function() {
|
|||
|
||||
// Determine the maximum number of nodes at a particular level. This is used to size
|
||||
// the width of the tree properly.
|
||||
var maxChildCount = 0;
|
||||
var maxChildCount = roots.length;
|
||||
for (var i = 0; i < this.images_.length; ++i) {
|
||||
var image = this.images_[i];
|
||||
var imageNode = imageByDBID[image.dbid];
|
||||
|
|
Reference in a new issue