mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-29 09:20:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

better escaping

Browse source
This commit is contained in:
Peter Cottle 2012-09-28 14:07:33 -07:00
parent 6e7e06277e
commit 09ca30b224
4 changed files with 59 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/visuals.js
View file

@ -107,8 +107,15 @@ GitVisuals.prototype.calcBranchStacks = function() {
var thisId = branch.target.get('id');
map[thisId] = map[thisId] || [];
map[thisId].push(branch.id);
map[thisId].sort();
map[thisId].push(branch);
map[thisId].sort(function(a, b) {
var aId = a.obj.get('id');
var bId = b.obj.get('id');
if (aId == 'master' || bId == 'master') {
return aId == 'master' ? -1 : 1;
}
return aId.localeCompare(bId);
});
});
this.branchStackMap = map;
};
@ -208,10 +215,11 @@ GitVisuals.prototype.addBranch = function(branch) {
var visBranch = new VisBranch({
branch: branch
});
branch.set('visBranch', visBranch);
this.visBranchCollection.add(visBranch);
if (this.paperReady) {
visBranch.genGraphics(paper);
this.zIndexReflow();
}
};