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

whoops broke all levels Issue #104

Browse source
This commit is contained in:
Peter Cottle 2013-06-11 10:03:11 -07:00
parent c7da989845
commit 7b68e0da73
7 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/js/git/treeCompare.js
View file

@ -32,6 +32,7 @@ TreeCompare.dispatch = function(levelBlob, goalTreeString, treeToCompare) {
TreeCompare.compareAllBranchesWithinTreesAndHEAD = function(treeA, treeB) {
treeA = this.convertTreeSafe(treeA);
treeB = this.convertTreeSafe(treeB);
debugger;
return treeA.HEAD.target == treeB.HEAD.target && this.compareAllBranchesWithinTrees(treeA, treeB);
};

5
src/js/level/index.js
View file

@ -338,11 +338,8 @@ var Level = Sandbox.extend({
return;
}
// TODO refactor this ugly ass switch statement...
// BIG TODO REALLY REFACTOR HAX HAX
// ok so lets see if they solved it...
var current = this.mainVis.gitEngine.exportTree();
var solved = TreeCompare.dispatch(this.level, current);
var solved = TreeCompare.dispatchFromLevel(this.level, current);
if (!solved) {
defer.resolve();