mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-26 16:08:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

BOOM\! Got branch stack ordering down

Browse source
This commit is contained in:
Peter Cottle 2012-09-28 11:51:18 -07:00
parent 499961f3b5
commit 6e7e06277e
4 changed files with 76 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/visuals.js
View file

@ -8,6 +8,7 @@ function GitVisuals(options) {
this.commitMap = {};
this.rootCommit = null;
this.branchStackMap = {};
this.paperReady = false;
this.paperWidth = null;
@ -95,6 +96,21 @@ GitVisuals.prototype.calculateTreeCoords = function() {
this.calcDepth();
this.calcWidth();
this.calcBranchStacks();
};
GitVisuals.prototype.calcBranchStacks = function() {
var branches = gitEngine.getBranches();
var map = {};
_.each(branches, function(branch) {
var thisId = branch.target.get('id');
map[thisId] = map[thisId] || [];
map[thisId].push(branch.id);
map[thisId].sort();
});
this.branchStackMap = map;
};
GitVisuals.prototype.calcWidth = function() {
@ -195,6 +211,7 @@ GitVisuals.prototype.addBranch = function(branch) {
this.visBranchCollection.add(visBranch);
if (this.paperReady) {
visBranch.genGraphics(paper);
this.zIndexReflow();
}
};
@ -287,8 +304,16 @@ GitVisuals.prototype.collectionChanged = function() {
// redo stuff
};
GitVisuals.prototype.zIndexReflow = function() {
this.visBranchCollection.each(function(vBranch) {
vBranch.textToFront();
});
};
GitVisuals.prototype.drawTreeFirstTime = function() {
this.paperReady = true;
this.calculateTreeCoords();
_.each(this.visNodeMap, function(visNode) {
visNode.genGraphics(paper);
}, this);
@ -301,7 +326,7 @@ GitVisuals.prototype.drawTreeFirstTime = function() {
visBranch.genGraphics(paper);
}, this);
this.refreshTreeHarsh();
this.zIndexReflow();
};