mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-25 15:38:33 +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

12
build/bundle.js
View file

@ -6361,11 +6361,8 @@ var Level = Sandbox.extend({
return; 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 current = this.mainVis.gitEngine.exportTree();
var solved = TreeCompare.dispatch(this.level, current); var solved = TreeCompare.dispatchFromLevel(this.level, current);
if (!solved) { if (!solved) {
defer.resolve(); defer.resolve();
@ -9692,6 +9689,7 @@ TreeCompare.dispatch = function(levelBlob, goalTreeString, treeToCompare) {
TreeCompare.compareAllBranchesWithinTreesAndHEAD = function(treeA, treeB) { TreeCompare.compareAllBranchesWithinTreesAndHEAD = function(treeA, treeB) {
treeA = this.convertTreeSafe(treeA); treeA = this.convertTreeSafe(treeA);
treeB = this.convertTreeSafe(treeB); treeB = this.convertTreeSafe(treeB);
debugger;
return treeA.HEAD.target == treeB.HEAD.target && this.compareAllBranchesWithinTrees(treeA, treeB); return treeA.HEAD.target == treeB.HEAD.target && this.compareAllBranchesWithinTrees(treeA, treeB);
}; };
@ -25483,6 +25481,7 @@ TreeCompare.dispatch = function(levelBlob, goalTreeString, treeToCompare) {
TreeCompare.compareAllBranchesWithinTreesAndHEAD = function(treeA, treeB) { TreeCompare.compareAllBranchesWithinTreesAndHEAD = function(treeA, treeB) {
treeA = this.convertTreeSafe(treeA); treeA = this.convertTreeSafe(treeA);
treeB = this.convertTreeSafe(treeB); treeB = this.convertTreeSafe(treeB);
debugger;
return treeA.HEAD.target == treeB.HEAD.target && this.compareAllBranchesWithinTrees(treeA, treeB); return treeA.HEAD.target == treeB.HEAD.target && this.compareAllBranchesWithinTrees(treeA, treeB);
}; };
@ -27330,11 +27329,8 @@ var Level = Sandbox.extend({
return; 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 current = this.mainVis.gitEngine.exportTree();
var solved = TreeCompare.dispatch(this.level, current); var solved = TreeCompare.dispatchFromLevel(this.level, current);
if (!solved) { if (!solved) {
defer.resolve(); defer.resolve();

1
build/bundle.min.2da41809.js
View file

File diff suppressed because one or more lines are too long

1
build/bundle.min.53c1d8c4.js Normal file
View file

File diff suppressed because one or more lines are too long

2
build/bundle.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
index.html
View file

@ -426,7 +426,7 @@
For a much easier time perusing the source, see the individual files at: For a much easier time perusing the source, see the individual files at:
https://github.com/pcottle/learnGitBranching https://github.com/pcottle/learnGitBranching
--> -->
<script src="build/bundle.min.2da41809.js"></script> <script src="build/bundle.min.53c1d8c4.js"></script>
<!-- The advantage of github pages: super-easy, simple, slick static hostic. <!-- The advantage of github pages: super-easy, simple, slick static hostic.
The downside? No raw logs to parse for analytics, so I have to include The downside? No raw logs to parse for analytics, so I have to include

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

@ -32,6 +32,7 @@ TreeCompare.dispatch = function(levelBlob, goalTreeString, treeToCompare) {
TreeCompare.compareAllBranchesWithinTreesAndHEAD = function(treeA, treeB) { TreeCompare.compareAllBranchesWithinTreesAndHEAD = function(treeA, treeB) {
treeA = this.convertTreeSafe(treeA); treeA = this.convertTreeSafe(treeA);
treeB = this.convertTreeSafe(treeB); treeB = this.convertTreeSafe(treeB);
debugger;
return treeA.HEAD.target == treeB.HEAD.target && this.compareAllBranchesWithinTrees(treeA, treeB); 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; 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 current = this.mainVis.gitEngine.exportTree();
var solved = TreeCompare.dispatch(this.level, current); var solved = TreeCompare.dispatchFromLevel(this.level, current);
if (!solved) { if (!solved) {
defer.resolve(); defer.resolve();