mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-28 22:55:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge main

Browse source
This commit is contained in:
Peter Cottle 2023-06-24 10:33:32 -06:00
commit b30bcb0395
1 changed files with 25 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -264,6 +264,7 @@ var Level = Sandbox.extend({
var toIssue = this.level.solutionCommand; var toIssue = this.level.solutionCommand;
var issueFunc = function() { var issueFunc = function() {
this.isShowingSolution = true; this.isShowingSolution = true;
this.wasResetAfterSolved = true;
Main.getEventBaton().trigger( Main.getEventBaton().trigger(
'commandSubmitted', 'commandSubmitted',
toIssue toIssue
@ -281,6 +282,7 @@ var Level = Sandbox.extend({
return; return;
} }
if(!LevelStore.isLevelSolved(this.level.id)){
// allow them for force the solution // allow them for force the solution
var confirmDefer = Q.defer(); var confirmDefer = Q.defer();
var dialog = intl.getDialog(require('../dialogs/confirmShowSolution'))[0]; var dialog = intl.getDialog(require('../dialogs/confirmShowSolution'))[0];
@ -300,6 +302,10 @@ var Level = Sandbox.extend({
command.finishWith(deferred); command.finishWith(deferred);
}, confirmView.getAnimationTime()); }, confirmView.getAnimationTime());
}); });
} else {
issueFunc();
command.finishWith(deferred);
}
}, },
toggleObjective: function() { toggleObjective: function() {