From 21fbde2c3122e44c9b7fd80bf36dd21085f1f7ff Mon Sep 17 00:00:00 2001 From: Peter Cottle Date: Tue, 18 Jun 2024 16:24:57 +0900 Subject: [PATCH] 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; }