going ot bed

This commit is contained in:
Peter Cottle 2013-01-21 21:49:43 -08:00
parent ab5a752691
commit e0bdf54d96
4 changed files with 14 additions and 3 deletions

View file

@ -6976,6 +6976,7 @@ var Level = Sandbox.extend({
var numCommands = this.gitCommandsIssued.length; var numCommands = this.gitCommandsIssued.length;
var best = this.getNumSolutionCommands(); var best = this.getNumSolutionCommands();
Constants.GLOBAL.isAnimating = true;
var skipFinishDialog = this.testOption('noFinishDialog'); var skipFinishDialog = this.testOption('noFinishDialog');
var finishAnimationChain = this.mainVis.gitVisuals.finishAnimation(); var finishAnimationChain = this.mainVis.gitVisuals.finishAnimation();
if (!skipFinishDialog) { if (!skipFinishDialog) {
@ -7006,6 +7007,7 @@ var Level = Sandbox.extend({
// nothing to do, we will just close // nothing to do, we will just close
}) })
.done(function() { .done(function() {
Constants.GLOBAL.isAnimating = false;
defer.resolve(); defer.resolve();
}); });
}, },
@ -16886,7 +16888,8 @@ LevelArbiter.prototype.getLevel = function(id) {
LevelArbiter.prototype.getNextLevel = function(id) { LevelArbiter.prototype.getNextLevel = function(id) {
if (!this.levelMap[id]) { if (!this.levelMap[id]) {
throw new Error('that level doesnt exist!'); console.warn('that level doesnt exist!!!');
return null;
} }
// meh, this method could be better. It's a tradeoff between // meh, this method could be better. It's a tradeoff between
@ -21017,7 +21020,8 @@ LevelArbiter.prototype.getLevel = function(id) {
LevelArbiter.prototype.getNextLevel = function(id) { LevelArbiter.prototype.getNextLevel = function(id) {
if (!this.levelMap[id]) { if (!this.levelMap[id]) {
throw new Error('that level doesnt exist!'); console.warn('that level doesnt exist!!!');
return null;
} }
// meh, this method could be better. It's a tradeoff between // meh, this method could be better. It's a tradeoff between
@ -21794,6 +21798,7 @@ var Level = Sandbox.extend({
var numCommands = this.gitCommandsIssued.length; var numCommands = this.gitCommandsIssued.length;
var best = this.getNumSolutionCommands(); var best = this.getNumSolutionCommands();
Constants.GLOBAL.isAnimating = true;
var skipFinishDialog = this.testOption('noFinishDialog'); var skipFinishDialog = this.testOption('noFinishDialog');
var finishAnimationChain = this.mainVis.gitVisuals.finishAnimation(); var finishAnimationChain = this.mainVis.gitVisuals.finishAnimation();
if (!skipFinishDialog) { if (!skipFinishDialog) {
@ -21824,6 +21829,7 @@ var Level = Sandbox.extend({
// nothing to do, we will just close // nothing to do, we will just close
}) })
.done(function() { .done(function() {
Constants.GLOBAL.isAnimating = false;
defer.resolve(); defer.resolve();
}); });
}, },

View file

@ -133,7 +133,8 @@ LevelArbiter.prototype.getLevel = function(id) {
LevelArbiter.prototype.getNextLevel = function(id) { LevelArbiter.prototype.getNextLevel = function(id) {
if (!this.levelMap[id]) { if (!this.levelMap[id]) {
throw new Error('that level doesnt exist!'); console.warn('that level doesnt exist!!!');
return null;
} }
// meh, this method could be better. It's a tradeoff between // meh, this method could be better. It's a tradeoff between

View file

@ -332,6 +332,7 @@ var Level = Sandbox.extend({
var numCommands = this.gitCommandsIssued.length; var numCommands = this.gitCommandsIssued.length;
var best = this.getNumSolutionCommands(); var best = this.getNumSolutionCommands();
Constants.GLOBAL.isAnimating = true;
var skipFinishDialog = this.testOption('noFinishDialog'); var skipFinishDialog = this.testOption('noFinishDialog');
var finishAnimationChain = this.mainVis.gitVisuals.finishAnimation(); var finishAnimationChain = this.mainVis.gitVisuals.finishAnimation();
if (!skipFinishDialog) { if (!skipFinishDialog) {
@ -362,6 +363,7 @@ var Level = Sandbox.extend({
// nothing to do, we will just close // nothing to do, we will just close
}) })
.done(function() { .done(function() {
Constants.GLOBAL.isAnimating = false;
defer.resolve(); defer.resolve();
}); });
}, },

View file

@ -5,6 +5,8 @@ Big Things
Medium things: Medium things:
~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
[ ] fix clickthrough when goal and start are shown [ ] fix clickthrough when goal and start are shown
[ ] animating lock refactor -- not just a boolean, but a stack
[ ] fix refreshing during solution animation
Cases to handle / things to edit Cases to handle / things to edit
======================= =======================