From 0c3498d29f6370ac9fca2a5afd4392bf06ddef22 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Fri, 2 Nov 2012 13:25:33 -0600
Subject: [PATCH] Cleanup/optimize `Keymap#keystrokeStringForEvent`

---
 src/app/keymap.coffee | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/app/keymap.coffee b/src/app/keymap.coffee
index d88a09041..241a96f86 100644
--- a/src/app/keymap.coffee
+++ b/src/app/keymap.coffee
@@ -87,28 +87,28 @@ class Keymap
       currentKeystroke
 
   keystrokeStringForEvent: (event) ->
-    if /^U\+/i.test event.originalEvent.keyIdentifier
-      hexCharCode = event.originalEvent.keyIdentifier.replace(/^U\+/i, '')
+    if event.originalEvent.keyIdentifier.indexOf('U+') == 0
+      hexCharCode = event.originalEvent.keyIdentifier[2..]
       charCode = parseInt(hexCharCode, 16)
       key = @keyFromCharCode(charCode)
     else
       key = event.originalEvent.keyIdentifier.toLowerCase()
 
-    modifiers = ''
+    modifiers = []
     if event.altKey and key isnt 'alt'
-      modifiers += 'alt-'
+      modifiers.push 'alt'
     if event.ctrlKey and key isnt 'ctrl'
-      modifiers += 'ctrl-'
+      modifiers.push 'ctrl'
     if event.metaKey and key isnt 'meta'
-      modifiers += 'meta-'
+      modifiers.push 'meta'
 
     if event.shiftKey
       isNamedKey = key.length > 1
-      modifiers += 'shift-' if isNamedKey
+      modifiers.push 'shift' if isNamedKey
     else
       key = key.toLowerCase()
 
-    "#{modifiers}#{key}"
+    [modifiers..., key].join('-')
 
   keyFromCharCode: (charCode) ->
     switch charCode