From fc0a46d6b2efd16fa69e4432baaca522c103eab8 Mon Sep 17 00:00:00 2001 From: probablycorey Date: Thu, 14 Nov 2013 16:05:10 -0800 Subject: [PATCH] Add mappingsForKeystrokeMatchingElement --- src/keymap.coffee | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/keymap.coffee b/src/keymap.coffee index 9c2d489bf..c066572b9 100644 --- a/src/keymap.coffee +++ b/src/keymap.coffee @@ -82,8 +82,7 @@ class Keymap element = event.target element = rootView[0] if element == document.body keystroke = @keystrokeStringForEvent(event, @queuedKeystroke) - mappings = @mappingsForKeystroke(keystroke) - mappings = @mappingsMatchingElement(mappings, element) + mappings = @mappingsForKeystrokeMatchingElement(keystroke, element) if mappings.length == 0 and @queuedKeystroke @queuedKeystroke = null @@ -118,6 +117,10 @@ class Keymap mappings + mappingsForKeystrokeMatchingElement: (keystroke, element) -> + mappings = @mappingsForKeystroke(keystroke) + @mappingsMatchingElement(element, mappings) + mappingsForKeystroke: (keystroke) -> mappings = @allMappings().filter (mapping) -> multiKeystroke = /\s/.test keystroke