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

part of reload fixed

Browse source
This commit is contained in:
Peter Cottle 2012-11-04 23:53:34 -08:00
parent 60214f93b2
commit 3281c88b52
2 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/git.js
View file

@ -130,7 +130,6 @@ GitEngine.prototype.reloadGraphics = function() {
rootCommit = commit; rootCommit = commit;
} }
}); });
this.gitVisuals.rootCommit = rootCommit; this.gitVisuals.rootCommit = rootCommit;
// this just basically makes the HEAD branch. the head branch really should have been // this just basically makes the HEAD branch. the head branch really should have been

10
src/visuals.js
View file

@ -88,8 +88,6 @@ GitVisuals.prototype.deferFlush = function() {
_.each(this.deferred, function(action) { _.each(this.deferred, function(action) {
action(); action();
}, this); }, this);
console.log('defer flushed', this.visBranchCollection);
console.log(this.branchCollection);
this.deferred = []; this.deferred = [];
}; };
@ -454,25 +452,21 @@ GitVisuals.prototype.addBranchFromEvent = function(branch, collection, index) {
}, this); }, this);
if (!this.gitEngine || !this.gitReady) { if (!this.gitEngine || !this.gitReady) {
console.log('deferring this action', branch);
this.defer(action); this.defer(action);
} else { } else {
action(); action();
} }
}; };
GitVisuals.prototype.addBranch = function(branch, paperOverride) { GitVisuals.prototype.addBranch = function(branch) {
var visBranch = new VisBranch({ var visBranch = new VisBranch({
branch: branch, branch: branch,
gitVisuals: this, gitVisuals: this,
gitEngine: this.gitEngine gitEngine: this.gitEngine
}); });
console.log('adding branch with name', branch.get('id'));
console.log('git ready', this.gitReady, ' and paper', paperOverride);
this.visBranchCollection.add(visBranch); this.visBranchCollection.add(visBranch);
if (!paperOverride && this.gitReady) { if (this.gitReady) {
console.log('genningg raphics?');
visBranch.genGraphics(this.paper); visBranch.genGraphics(this.paper);
} }
}; };