From 11eb22be33d4530199ba3c9111e785a8ce8e46ba Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Mon, 26 Oct 2015 19:46:42 -0400
Subject: [PATCH] esc to blur console moved from appstate to console js
---
js/menus/otherUI/Console.js | 4 +++-
js/models/AppState.js | 5 +----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/js/menus/otherUI/Console.js b/js/menus/otherUI/Console.js
index adeba7e1..7dbeea40 100644
--- a/js/menus/otherUI/Console.js
+++ b/js/menus/otherUI/Console.js
@@ -67,11 +67,13 @@ define(['jquery', 'underscore', 'backbone', 'appState'], function($, _, Backbone
},
_onKeyUp: function(e){
+
var $input = $("#consoleInput");
if ($input.is(":focus")){
+ if (e.keyCode == 27) $input.blur();
// if (e.keyCode == 38) $output.val(this.model.getPrevHistElem());
// else if (e.keyCode == 40) $output.val(this.model.getNewerHistElem());
- if (e.keyCode == 13) this._enterCommand($input);
+ else if (e.keyCode == 13) this._enterCommand($input);
}
},
diff --git a/js/models/AppState.js b/js/models/AppState.js
index 7eed61b9..c9b3b9bb 100644
--- a/js/models/AppState.js
+++ b/js/models/AppState.js
@@ -192,10 +192,7 @@ define(['underscore', 'backbone', 'threeModel', 'three', 'plist', 'globals'],
_handleKeyStroke: function(e){//receives keyup and keydown
- if ($("input").is(':focus')) {
- if (e.keyCode == 27) $(':focus').blur();
- return;
- }//we are typing in an input
+ if ($("input").is(':focus')) return;//we are typing in an input
if ($("textarea").is(':focus')) return;//we are typing in an input
var state = e.data.state;
--
GitLab