ok keyboard input now

src/js/level/index.js

@@ -27,7 +27,6 @@ var Level = Sandbox.extend({
     options = options || {};
     options.level = options.level || {};
 
-    console.log('the level im receiving is', options.level);
     this.level = options.level;
 
     this.gitCommandsIssued = 0;
@@ -116,7 +115,7 @@ var Level = Sandbox.extend({
     });
   },
 
-  showSolution: function(command, defer) {
+  showSolution: function(command, deferred) {
     var confirmDefer = Q.defer();
     var confirmView = new ConfirmCancelTerminal({
       modalAlert: {
@@ -131,49 +130,22 @@ var Level = Sandbox.extend({
 
     confirmDefer.promise
     .then(_.bind(function() {
-      // it's next tick because we need to close the
-      // dialog first or otherwise it will steal the event
-      // baton fire
-      process.nextTick(_.bind(function() {
-        Main.getEventBaton().trigger(
-          'commandSubmitted',
-          'reset;' + this.solutionCommand
-        );
-      }, this));
-      // we also need to defer this logic...
-      var whenClosed = Q.defer();
-      whenClosed.promise
-      .then(function() {
-        return Q.delay(700);
-      })
-      .then(function() {
-        command.finishWith(defer);
-      })
-      .done();
-
+      // ok great add the solution command
+      Main.getEventBaton().trigger(
+        'commandSubmitted',
+        'reset;' + this.solutionCommand
+      );
       this.hideGoal();
       command.setResult('Solution command added to the command queue...');
-
-      // start that process...
-      whenClosed.resolve();
     }, this))
     .fail(function() {
       command.setResult("Great! I'll let you get back to it");
-
-      var whenClosed = Q.defer();
-      whenClosed.promise
-      .then(function() {
-        return Q.delay(700);
-      })
-      .then(function() {
-        command.finishWith(defer);
-      })
-      .done();
-
-      whenClosed.resolve();
     })
     .done(function() {
-      confirmView.close();
+     // either way we animate, so both options can share this logic
+     setTimeout(function() {
+        command.finishWith(deferred);
+      }, confirmView.getAnimationTime());
     });
   },
 

src/js/level/sandbox.js

@@ -77,9 +77,6 @@ var Sandbox = Backbone.View.extend({
     Main.getEventBaton().releaseBaton('commandSubmitted', this.commandSubmitted, this);
     // we obviously take care of sandbox commands
     Main.getEventBaton().releaseBaton('processSandboxCommand', this.processSandboxCommand, this);
-    console.log('just released two things about to...');
-    console.log(Main.getEventBaton());
-
     // a few things to help transition between levels and sandbox
     Main.getEventBaton().releaseBaton('levelExited', this.levelExited, this);
 

src/js/views/index.js

@@ -6,6 +6,7 @@ var Backbone = (!require('../util').isBrowser()) ? require('backbone') : window.
 
 var Main = require('../app');
 var Constants = require('../util/constants');
+var KeyboardListener = require('../util/keyboard').KeyboardListener;
 
 var BaseView = Backbone.View.extend({
   getDestination: function() {
@@ -279,31 +280,97 @@ var ConfirmCancelTerminal = Backbone.View.extend({
   initialize: function(options) {
     options = options || {};
 
+
     this.deferred = options.deferred || Q.defer();
     this.modalAlert = new ModalAlert(_.extend(
       {},
       { markdown: '#you sure?' },
       options.modalAlert
     ));
+
+
+    var buttonDefer = Q.defer();
+    this.buttonDefer = buttonDefer;
     this.confirmCancel = new ConfirmCancelView({
-      deferred: this.deferred,
+      deferred: buttonDefer,
       destination: this.modalAlert.getDestination()
     });
 
+    // whenever they hit a button. make sure
+    // we close and pass that to our deferred
+    buttonDefer.promise
+    .then(_.bind(function() {
+      this.deferred.resolve();
+    }, this))
+    .fail(_.bind(function() {
+      this.deferred.reject();
+    }, this))
+    .done(_.bind(function() {
+      this.close();
+    }, this));
+
+    // also setup keyboard
+    this.navEvents = _.clone(Backbone.Events);
+    this.navEvents.on('positive', this.positive, this);
+    this.navEvents.on('negative', this.negative, this);
+    this.keyboardListener = new KeyboardListener({
+      events: this.navEvents,
+      aliasMap: {
+        enter: 'positive',
+        esc: 'negative'
+      }
+    });
+
     if (!options.wait) {
       this.modalAlert.show();
     }
   },
 
+  positive: function() {
+    this.buttonDefer.resolve();
+  },
+
+  negative: function() {
+    this.buttonDefer.reject();
+  },
+
+  getAnimationTime: function() { return 700; },
+
+  show: function() {
+    this.modalAlert.show();
+  },
+
+  hide: function() {
+    this.modalAlert.hide();
+  },
+
   getPromise: function() {
     return this.deferred.promise;
   },
 
   close: function() {
+    this.keyboardListener.mute();
     this.modalAlert.die();
   }
 });
 
+var NextLevelConfirm = ConfirmCancelTerminal.extend({
+  initialize: function(options) {
+    options = options || {};
+    this.nextLevelName = options.nextLevelName || 'The mysterious next level';
+    options.modalAlert = {
+      markdowns: [
+        '## Great Job!!',
+        '',
+        'You solved the level. Would you like to move onto "',
+        this.nextLevelName + '", the next level?'
+      ]
+    };
+
+    ConfirmCancelTerminal.prototype.initialize.apply(this, [options]);
+  }
+});
+
 var ZoomAlertWindow = Backbone.View.extend({
   initialize: function(options) {
     this.grabBatons();
@@ -446,4 +513,5 @@ exports.ConfirmCancelTerminal = ConfirmCancelTerminal;
 
 exports.CanvasTerminalHolder = CanvasTerminalHolder;
 exports.LevelToolbar = LevelToolbar;
+exports.NextLevelConfirm = NextLevelConfirm;