From d57c5121e701004625bfc20d8823df7425938654 Mon Sep 17 00:00:00 2001
From: timb <opuscule@gmail.com>
Date: Wed, 10 Jun 2015 02:24:04 -0400
Subject: esc can cancel canvas selection if one exists. also, handle esc
 before controls with raw_key handler so that esc still blurs focus

---
 js/ui/keys.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'js/ui/keys.js')

diff --git a/js/ui/keys.js b/js/ui/keys.js
index 739871b..c8df3e8 100644
--- a/js/ui/keys.js
+++ b/js/ui/keys.js
@@ -9,15 +9,24 @@ var keys = (function(){
       if (e.altKey) {
         document.body.classList.add("dropper")
       }
+
+      switch (e.keyCode) {
+        case 27: // esc
+          if (!selection.hidden && current_canvas === canvas){
+            selection.hide()
+            selection.show()
+          } else if (focused){
+            focused.blur()
+          }
+          return
+      }
+
       if (window.focused && focused.raw_key) {
         focused.raw_key(e)
         return
       }
 
       switch (e.keyCode) {
-        case 27: // esc
-          if (focused) focused.blur()
-          break
         case 219: // [
           if (current_tool.name != "text") {
             e.preventDefault()
-- 
cgit v1.2.3-70-g09d2