From 29a4ab139671e3c4996f260e83f2e851d7d11c72 Mon Sep 17 00:00:00 2001 From: Ivan Zuzak Date: Sun, 10 May 2015 09:26:46 +0200 Subject: [PATCH 1/2] Electron uses 'Plus' instead of '+' in accelerators --- src/browser/application-menu.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/browser/application-menu.coffee b/src/browser/application-menu.coffee index d88314c89..793d6347f 100644 --- a/src/browser/application-menu.coffee +++ b/src/browser/application-menu.coffee @@ -163,7 +163,7 @@ class ApplicationMenu return null unless firstKeystroke modifiers = firstKeystroke.split('-') - key = modifiers.pop() + key = modifiers.pop().toUpperCase().replace('+', 'Plus') modifiers = modifiers.map (modifier) -> modifier.replace(/shift/ig, "Shift") @@ -171,5 +171,5 @@ class ApplicationMenu .replace(/ctrl/ig, "Ctrl") .replace(/alt/ig, "Alt") - keys = modifiers.concat([key.toUpperCase()]) + keys = modifiers.concat([key]) keys.join("+") From 71fba995405e2940a0ef53f9c4e8169a6c64acb0 Mon Sep 17 00:00:00 2001 From: Ivan Zuzak Date: Sun, 10 May 2015 09:46:45 +0200 Subject: [PATCH 2/2] Dont split keystrokes on trailing dashes --- src/browser/application-menu.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/browser/application-menu.coffee b/src/browser/application-menu.coffee index 793d6347f..a845c682f 100644 --- a/src/browser/application-menu.coffee +++ b/src/browser/application-menu.coffee @@ -162,7 +162,7 @@ class ApplicationMenu firstKeystroke = keystrokesByCommand[command]?[0] return null unless firstKeystroke - modifiers = firstKeystroke.split('-') + modifiers = firstKeystroke.split(/-(?=.)/) key = modifiers.pop().toUpperCase().replace('+', 'Plus') modifiers = modifiers.map (modifier) ->