Remove 'Close Pane' Shortcut. Change bindings for panes. Fixes #1056.

railsware · May 27, 2017 · 5d1e980 · 5d1e980
1 parent 1f3638f
commit 5d1e980
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 31 deletions.
diff --git a/src/Enums.ts b/src/Enums.ts
@@ -120,7 +120,6 @@ export enum KeyboardAction {
     // pane commands
     panePrevious,
     paneNext,
-    paneClose,
     // edit/clipboard commands
     clipboardCopy,
     clipboardCut,

diff --git a/src/views/1_ApplicationComponent.tsx b/src/views/1_ApplicationComponent.tsx
@@ -150,17 +150,6 @@ export class ApplicationComponent extends React.Component<{}, ApplicationState>
             return;
         }
 
-        // Close focused pane
-        if (isKeybindingForEvent(event, KeyboardAction.paneClose) && jobFormComponent) {
-            this.closeFocusedPane();
-
-            this.forceUpdate();
-
-            event.stopPropagation();
-            event.preventDefault();
-            return;
-        }
-
         // Change focussed tab
         if (isKeybindingForEvent(event, KeyboardAction.tabFocus)) {
             const position = parseInt(event.key, 10);

diff --git a/src/views/keyevents/Keybindings.ts b/src/views/keyevents/Keybindings.ts
@@ -72,11 +72,6 @@ export const KeybindingsForActions: KeybindingType[] = [
             return (e.ctrlKey && e.keyCode === KeyCode.N) || (e.keyCode === KeyCode.Down);
         },
     },
-    // pane command
-    {
-        action: KeyboardAction.paneClose,
-        keybinding: (e: KeyboardEvent) => isMeta(e) && e.keyCode === KeyCode.D,
-    },
     // tab commands
     {
         action: KeyboardAction.tabFocus,
@@ -132,15 +127,11 @@ export const KeybindingsForMenu: KeybindingMenuType[] = [
     },
     {
         action: KeyboardAction.panePrevious,
-        accelerator: `${CmdOrCtrl}+K`,
+        accelerator: `Alt+[`,
     },
     {
         action: KeyboardAction.paneNext,
-        accelerator: `${CmdOrCtrl}+J`,
-    },
-    {
-        action: KeyboardAction.paneClose,
-        accelerator: `${CmdOrCtrl}+P`,
+        accelerator: `Alt+]`,
     },
     // edit/clipboard commands
     {

diff --git a/src/views/menu/Menu.ts b/src/views/menu/Menu.ts
@@ -197,14 +197,6 @@ export function buildMenuTemplate(
                 {
                     type: "separator",
                 },
-                {
-                    label: "Close",
-                    accelerator: getAcceleratorForAction(KeyboardAction.paneClose),
-                    click: () => {
-                        application.closeFocusedPane();
-                        application.forceUpdate();
-                    },
-                },
             ],
         },
         {