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

pretty much got finish down

Browse source
This commit is contained in:
Peter Cottle 2013-01-09 01:56:52 -08:00
parent 0c7ff70b14
commit 9381f42509
7 changed files with 183 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -85,10 +85,7 @@ var Level = Sandbox.extend({
},
initGoalData: function(options) {
this.goalTreeString = this.level.goalTreeString;
this.solutionCommand = this.level.solutionCommand;
if (!this.goalTreeString || !this.solutionCommand) {
if (!this.level.goalTreeString || !this.level.solutionCommand) {
throw new Error('need goal tree and solution');
}
},
@ -130,7 +127,7 @@ var Level = Sandbox.extend({
this.goalVis = new Visualization({
el: this.goalCanvasHolder.getCanvasLocation(),
containerElement: this.goalCanvasHolder.getCanvasLocation(),
treeString: this.goalTreeString,
treeString: this.level.goalTreeString,
noKeyboardInput: true,
noClick: true
});
@ -154,7 +151,7 @@ var Level = Sandbox.extend({
// ok great add the solution command
Main.getEventBaton().trigger(
'commandSubmitted',
'reset;' + this.solutionCommand
'reset;' + this.level.solutionCommand
);
this.hideGoal();
command.setResult('Solution command added to the command queue...');
@ -265,7 +262,7 @@ var Level = Sandbox.extend({
// ok so lets see if they solved it...
var current = this.mainVis.gitEngine.exportTree();
var solved = this.treeCompare.compareAllBranchesWithinTrees(current, this.goalTreeString);
var solved = this.treeCompare.compareAllBranchesWithinTrees(current, this.level.goalTreeString);
if (!solved) {
defer.resolve();
@ -348,6 +345,11 @@ var Level = Sandbox.extend({
throw new Errors.CommandResult({
msg: hintMsg
});
}],
[/^build level$/, function() {
throw new Errors.GitError({
msg: "You can't build a level inside a level! Please exit level first"
});
}]
];
},