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

reset bug on removing parts of a collection in place

Browse source
This commit is contained in:
Peter Cottle 2012-11-04 23:10:17 -08:00
parent 5246580b27
commit 925497377e
3 changed files with 26 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/git.js
View file

@ -123,8 +123,8 @@ GitEngine.prototype.instantiateFromTree = function(tree) {
};
GitEngine.prototype.reloadGraphics = function() {
// get the root commit, no better way to do it
var rootCommit = null;
this.commitCollection.each(function(commit) {
if (commit.get('id') == 'C0') {
rootCommit = commit;
@ -134,7 +134,7 @@ GitEngine.prototype.reloadGraphics = function() {
this.gitVisuals.rootCommit = rootCommit;
// 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... one day TODO
// a member of a collection and not this annoying edge case stuff... one day
this.gitVisuals.initHeadBranch();
// when the paper is ready

6
src/main.js
View file

@ -4,9 +4,13 @@
var events = _.clone(Backbone.Events);
var ui = null;
/**
* Static Classes
*/
var animationFactory = new AnimationFactory();
var paper = null;
///////////////////////////////////////////////////////////////////////
$(document).ready(function(){
ui = new UI();

35
src/visuals.js
View file

@ -88,16 +88,24 @@ GitVisuals.prototype.deferFlush = function() {
_.each(this.deferred, function(action) {
action();
}, this);
console.log('defer flushed', this.visBranchCollection);
console.log(this.branchCollection);
this.deferred = [];
};
GitVisuals.prototype.resetAll = function() {
this.visEdgeCollection.each(function(visEdge) {
// make sure to copy these collections because we remove
// items in place and underscore is too dumb to detect length change
var edges = this.visEdgeCollection.toArray();
_.each(edges, function(visEdge) {
visEdge.remove();
}, this);
this.visBranchCollection.each(function(visBranch) {
var branches = this.visBranchCollection.toArray();
_.each(branches, function(visBranch) {
visBranch.remove();
}, this);
_.each(this.visNodeMap, function(visNode) {
visNode.remove();
}, this);
@ -123,13 +131,7 @@ GitVisuals.prototype.initHeadBranch = function() {
// this ugly method which will be deleted one day
// seed this with the HEAD pseudo-branch
var headBranch = new VisBranch({
branch: this.gitEngine.HEAD,
gitVisuals: this,
gitEngine: this.gitEngine
});
this.visBranchCollection.add(headBranch);
this.addBranchFromEvent(this.gitEngine.HEAD);
};
GitVisuals.prototype.getScreenBounds = function() {
@ -451,7 +453,8 @@ GitVisuals.prototype.addBranchFromEvent = function(branch, collection, index) {
this.addBranch(branch);
}, this);
if (!this.gitEngine) {
if (!this.gitEngine || !this.gitReady) {
console.log('deferring this action', branch);
this.defer(action);
} else {
action();
@ -464,9 +467,12 @@ GitVisuals.prototype.addBranch = function(branch, paperOverride) {
gitVisuals: this,
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);
if (!paperOverride && this.gitReady) {
console.log('genningg raphics?');
visBranch.genGraphics(this.paper);
}
};
@ -594,13 +600,10 @@ GitVisuals.prototype.visBranchesFront = function() {
GitVisuals.prototype.drawTreeFromReload = function() {
this.gitReady = true;
this.calcTreeCoords();
// gen all the graphics we need
this.deferFlush();
this.visBranchCollection.each(function(visBranch) {
visBranch.genGraphics(this.paper, {
fromReload: true
});
}, this);
this.calcTreeCoords();
};
GitVisuals.prototype.drawTreeFirstTime = function() {