From 56c2a89613199bc0369a66d19bf848e14b019671 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sun, 5 Nov 2017 16:52:21 +0000
Subject: Rationalise the order of these tests.

The tests make more sense in this order.
---
 lib/keyboard_utils.coffee | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/keyboard_utils.coffee b/lib/keyboard_utils.coffee
index 8cd2a490..70aa5a95 100644
--- a/lib/keyboard_utils.coffee
+++ b/lib/keyboard_utils.coffee
@@ -31,17 +31,15 @@ KeyboardUtils =
       else if key.length == 1 and not event.shiftKey
         key = key.toLowerCase()
 
-    if key of @keyNames
-      @keyNames[key]
     # It appears that key is not always defined (see #2453).
-    else if not key?
+    unless key
       ""
+    else if key of @keyNames
+      @keyNames[key]
     else if key.length == 1
       key
-    else if 1 < key.length
-      key.toLowerCase()
     else
-      ""
+      key.toLowerCase()
 
   getKeyCharString: (event) ->
     if keyChar = @getKeyChar event
-- 
cgit v1.2.3