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

FIXED RELOADINGGGGGGGGGGGGGGGG

Browse source
This commit is contained in:
Peter Cottle 2012-10-27 17:05:43 -07:00
parent 5272cfea47
commit 6c6c789da8
3 changed files with 35 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/git.js
View file

@ -92,8 +92,9 @@ GitEngine.prototype.printAndCopyTree = function() {
GitEngine.prototype.loadTree = function(tree) {
// first clear everything
// debugger
this.removeAll();
this.instantiateFromTree(tree);
this.reloadGraphics();
@ -111,10 +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);
gitVisuals.paperReady = true;
var HEAD = this.getOrMakeRecursive(tree, createdSoFar, tree.HEAD.id);
this.HEAD = HEAD;
@ -122,11 +125,14 @@ GitEngine.prototype.instantiateFromTree = function(tree) {
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;
}
});
gitVisuals.rootCommit = rootCommit;
// this just basically makes the HEAD branch. the head branch really should have been
@ -135,9 +141,9 @@ GitEngine.prototype.reloadGraphics = function() {
gitVisuals.whenGitEngineReady(this);
// when the paper is ready
gitVisuals.drawTreeFirstTime();
gitVisuals.drawTreeFromReload();
console.log('refreshing hars');
console.log('refreshing harsh');
gitVisuals.refreshTreeHarsh();
};
@ -209,10 +215,10 @@ GitEngine.prototype.getOrMakeRecursive = function(tree, createdSoFar, objID) {
};
GitEngine.prototype.removeAll = function() {
gitVisuals.resetAll();
this.branchCollection.reset();
this.commitCollection.reset();
gitVisuals.resetAll();
};
GitEngine.prototype.getDetachedHead = function() {