fixes #86

Author: zaggino

app/appshell/app-menu.ts

@@ -8,7 +8,6 @@ import * as _ from "lodash";
 import * as assert from "assert";
 import { app, Menu } from "electron";
 import * as shell from "./shell";
-import * as electronLocalshortcut from "electron-localshortcut";
 
 const menuTemplate: MenuItemOptions[] = [];
 
@@ -21,15 +20,11 @@ app.on("browser-window-blur", function () {
     _refreshMenu();
 });
 
-// if overriden, these won't work in Brackets modal windows like Git commit
-const systemShortcuts = ["Ctrl+Z", "Ctrl+Y", "Ctrl+X", "Ctrl+C", "Ctrl+V", "Ctrl+A"];
+let currentShortcuts: { [accelerator: string]: string } = {};
 
 function registerShortcuts(win: Electron.BrowserWindow, menuItem: MenuItemOptions) {
-    if (
-        menuItem.accelerator &&
-        systemShortcuts.find((x) => x === menuItem.accelerator) == null
-    ) {
-        electronLocalshortcut.register(win, menuItem.accelerator, menuItem.click as Function);
+    if (menuItem.accelerator && menuItem.id) {
+        currentShortcuts[menuItem.accelerator] = menuItem.id;
     }
     if (Array.isArray(menuItem.submenu)) {
         menuItem.submenu.forEach((i) => registerShortcuts(win, i));
@@ -39,9 +34,10 @@ function registerShortcuts(win: Electron.BrowserWindow, menuItem: MenuItemOption
 const __refreshMenu = _.debounce(function () {
     Menu.setApplicationMenu(Menu.buildFromTemplate(_.cloneDeep(menuTemplate)));
     const mainWindow = shell.getMainWindow();
-    electronLocalshortcut.unregisterAll(mainWindow);
     if (mainWindow.isFocused()) {
+        currentShortcuts = {};
         menuTemplate.forEach((menuItem) => registerShortcuts(mainWindow, menuItem));
+        mainWindow.webContents.send("updateShortcuts", JSON.stringify(currentShortcuts));
     }
 }, 100);
 

app/electron-localshortcut.ts

@@ -66,7 +66,6 @@
         "async": "2.3.0",
         "chokidar": "1.6.1",
         "decompress-zip": "0.3.0",
-        "electron-localshortcut": "1.1.1",
         "fs-extra": "2.1.2",
         "isbinaryfile": "3.0.2",
         "lodash": "4.17.4",

package.json

@@ -365,6 +365,8 @@ define(function (require, exports, module) {
 
         // Editor supplies some standard keyboard behavior extensions of its own
         var codeMirrorKeyMap = {
+            "Ctrl-D": function () { window.triggerKeyboardShortcut("Ctrl-D"); },
+
             "Tab": function () { self._handleTabKey(); },
             "Shift-Tab": "indentLess",
 

src/editor/Editor.js

@@ -7,8 +7,13 @@ define(function (require, exports, module) {
     const Commands       = require("command/Commands");
 
     let appReady = false; // Set to true after app is fully initialized
+    let appShortcuts: { [shortcut: string]: string } = {};
 
-    electron.ipcRenderer.on("executeCommand", function (evt: any, eventName: string) {
+    electron.ipcRenderer.on("updateShortcuts", function (evt: any, data: string) {
+        appShortcuts = JSON.parse(data);
+    });
+
+    function executeCommand(eventName: string) {
         // Temporary fix for #2616 - don't execute the command if a modal dialog is open.
         // This should really be fixed with proper menu enabling.
         if ($(".modal.instance").length || !appReady) {
@@ -25,6 +30,18 @@ define(function (require, exports, module) {
 
         const promise = CommandManager.execute(eventName);
         return (promise && promise.state() === "rejected") ? false : true;
+    }
+
+    (window as any).triggerKeyboardShortcut = (shortcut: string) => {
+        const normalized = shortcut.replace(/-/g, "+");
+        if (appShortcuts[normalized]) {
+            return executeCommand(appShortcuts[normalized]);
+        }
+        return null;
+    };
+
+    electron.ipcRenderer.on("executeCommand", function (evt: any, eventName: string) {
+        return executeCommand(eventName);
     });
 
     electron.ipcRenderer.on("console-msg", function (evt: any, method: string, ...args: string[]) {