From 8d2f44c3797f3529b2039005f2051ea3a4463e4d Mon Sep 17 00:00:00 2001 From: Kris Maglione Date: Wed, 27 Jul 2011 05:31:08 -0400 Subject: [PATCH] =?UTF-8?q?Accept=20<=E2=8C=98-Foo>=20as=20an=20alias=20fo?= =?UTF-8?q?r=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/content/events.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/content/events.js b/common/content/events.js index 8d19a0d1..4aedc602 100644 --- a/common/content/events.js +++ b/common/content/events.js @@ -890,7 +890,7 @@ var Events = Module("events", { evt_obj.shiftKey = evt_str !== evt_str.toLowerCase(); } else { - let [match, modifier, keyname] = evt_str.match(/^<((?:[*12CASM]-)*)(.+?)>$/i) || [false, '', '']; + let [match, modifier, keyname] = evt_str.match(/^<((?:[*12CASM⌘]-)*)(.+?)>$/i) || [false, '', '']; modifier = Set(modifier.toUpperCase()); keyname = keyname.toLowerCase(); evt_obj.dactylKeyname = keyname; @@ -903,7 +903,7 @@ var Events = Module("events", { evt_obj.ctrlKey ="C" in modifier; evt_obj.altKey ="A" in modifier; evt_obj.shiftKey ="S" in modifier; - evt_obj.metaKey ="M" in modifier; + evt_obj.metaKey ="M" in modifier || "⌘" in modifier; evt_obj.dactylShift = evt_obj.shiftKey; if (keyname.length == 1) { // normal characters