From a3cfd3bb88b4e15a8ef658fad33b7102d305978a Mon Sep 17 00:00:00 2001
From: Peter Cottle <pcottle@meta.com>
Date: Tue, 18 Jun 2024 16:17:15 +0900
Subject: [PATCH 1/2] Resolves #1152 -- close level window on close button
 click

---
 src/js/views/gitDemonstrationView.js | 8 ++++++++
 src/js/views/index.js                | 7 ++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/js/views/gitDemonstrationView.js b/src/js/views/gitDemonstrationView.js
index d7198ad3..a3d694b9 100644
--- a/src/js/views/gitDemonstrationView.js
+++ b/src/js/views/gitDemonstrationView.js
@@ -60,6 +60,7 @@ var GitDemonstrationView = ContainedBase.extend({
     this.navEvents = Object.assign({}, Backbone.Events);
     this.navEvents.on('positive', this.positive, this);
     this.navEvents.on('negative', this.negative, this);
+    this.navEvents.on('exit', this.exit, this);
     this.navEvents.on('onResetButtonClick', this.onResetButtonClick, this);
     this.keyboardListener = new KeyboardListener({
       events: this.navEvents,
@@ -79,9 +80,16 @@ var GitDemonstrationView = ContainedBase.extend({
     }
   },
 
+  exit: function() {
+    alert('exittt');
+  },
+
   receiveMetaNav: function(navView, metaContainerView) {
+    console.log('receive meta nav');
+    debugger;
     var _this = this;
     navView.navEvents.on('positive', this.positive, this);
+    navView.navEvents.on('exit', this.exit, this);
     this.metaContainerView = metaContainerView;
   },
 
diff --git a/src/js/views/index.js b/src/js/views/index.js
index ccebfffe..9204c31d 100644
--- a/src/js/views/index.js
+++ b/src/js/views/index.js
@@ -314,7 +314,8 @@ var ModalTerminal = ContainedBase.extend({
   className: 'modalTerminal box flex1',
   template: _.template($('#terminal-window-template').html()),
   events: {
-    'click div.inside': 'onClick'
+    'click div.inside': 'onClick',
+    'click div.controls div.close': 'onCloseButtonClick'
   },
 
   initialize: function(options) {
@@ -333,6 +334,10 @@ var ModalTerminal = ContainedBase.extend({
     this.$('.modal-title').text(title);
   },
 
+  onCloseButtonClick: function() {
+    console.log('triggering stuff');
+  },
+
   onClick: function() {
     this.navEvents.trigger('click');
   },

From 21fbde2c3122e44c9b7fd80bf36dd21085f1f7ff Mon Sep 17 00:00:00 2001
From: Peter Cottle <pcottle@meta.com>
Date: Tue, 18 Jun 2024 16:24:57 +0900
Subject: [PATCH 2/2] finish

---
 src/js/util/keyboard.js              | 8 +++++++-
 src/js/views/gitDemonstrationView.js | 2 --
 src/js/views/index.js                | 2 +-
 src/style/main.css                   | 4 ++++
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/js/util/keyboard.js b/src/js/util/keyboard.js
index cbe2d279..9217977f 100644
--- a/src/js/util/keyboard.js
+++ b/src/js/util/keyboard.js
@@ -30,11 +30,18 @@ KeyboardListener.prototype.listen = function() {
   }
   this.listening = true;
   Main.getEventBaton().stealBaton('docKeydown', this.keydown, this);
+  Main.getEventBaton().stealBaton('onCloseButtonClick', this.onCloseButtonClick, this);
+
 };
 
 KeyboardListener.prototype.mute = function() {
   this.listening = false;
   Main.getEventBaton().releaseBaton('docKeydown', this.keydown, this);
+  Main.getEventBaton().releaseBaton('onCloseButtonClick', this.onCloseButtonClick, this);
+};
+
+KeyboardListener.prototype.onCloseButtonClick = function(e) {
+  this.fireEvent('esc', e);
 };
 
 KeyboardListener.prototype.keydown = function(e) {
@@ -59,4 +66,3 @@ KeyboardListener.prototype.passEventBack = function(e) {
 
 exports.KeyboardListener = KeyboardListener;
 exports.mapKeycodeToKey = mapKeycodeToKey;
-
diff --git a/src/js/views/gitDemonstrationView.js b/src/js/views/gitDemonstrationView.js
index a3d694b9..8d942f27 100644
--- a/src/js/views/gitDemonstrationView.js
+++ b/src/js/views/gitDemonstrationView.js
@@ -85,8 +85,6 @@ var GitDemonstrationView = ContainedBase.extend({
   },
 
   receiveMetaNav: function(navView, metaContainerView) {
-    console.log('receive meta nav');
-    debugger;
     var _this = this;
     navView.navEvents.on('positive', this.positive, this);
     navView.navEvents.on('exit', this.exit, this);
diff --git a/src/js/views/index.js b/src/js/views/index.js
index 9204c31d..dd7b3cf1 100644
--- a/src/js/views/index.js
+++ b/src/js/views/index.js
@@ -335,7 +335,7 @@ var ModalTerminal = ContainedBase.extend({
   },
 
   onCloseButtonClick: function() {
-    console.log('triggering stuff');
+    Main.getEventBaton().trigger('onCloseButtonClick');
   },
 
   onClick: function() {
diff --git a/src/style/main.css b/src/style/main.css
index c2602fc9..18a35ab7 100644
--- a/src/style/main.css
+++ b/src/style/main.css
@@ -480,6 +480,10 @@ div.ui-draggable div.controls div.box.flex1 div {
   cursor: pointer;
 }
 
+div.modalTerminal div.close {
+  cursor: pointer !important;
+}
+
 div.controls div.box.flex1 div.close {
   background-color: #fb625f;
 }