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

and also bug about backbone events throwing random args

Browse source
This commit is contained in:
Peter Cottle 2012-10-27 18:21:18 -07:00
parent 6c6c789da8
commit eb254126cb
3 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/git.js
View file

@ -112,12 +112,12 @@ GitEngine.prototype.instantiateFromTree = function(tree) {
this.commitCollection.add(commit);
}, this);
gitVisuals.paperReady = false;
_.each(tree.branches, function(branchJSON) {
var branch = this.getOrMakeRecursive(tree, createdSoFar, branchJSON.id);
this.branchCollection.add(branch);
this.branchCollection.add(branch, {silent: true});
gitVisuals.addBranch(branch, true /* paper override */);
}, this);
gitVisuals.paperReady = true;
var HEAD = this.getOrMakeRecursive(tree, createdSoFar, tree.HEAD.id);
this.HEAD = HEAD;
@ -127,7 +127,6 @@ GitEngine.prototype.reloadGraphics = function() {
var rootCommit = null;
this.commitCollection.each(function(commit) {
console.log('finding commit from collection', commit.get('id'));
if (commit.get('id') == 'C0') {
rootCommit = commit;
}
@ -137,13 +136,11 @@ GitEngine.prototype.reloadGraphics = function() {
// this just basically makes the HEAD branch. the head branch really should have been
// a member of a collection and not this annoying edge case stuff...
console.log('calling when git engine ready');
gitVisuals.whenGitEngineReady(this);
// when the paper is ready
gitVisuals.drawTreeFromReload();
console.log('refreshing harsh');
gitVisuals.refreshTreeHarsh();
};