Fix for keymapping bug on Linux and Windows (#2189)

* Fix for keymapping bug on Linux and Windows

In response to issue #2156, the keymapping conflict has been removed from linux.json and win32.json in the app/keymaps/ directory. Now the keymap for window close is ctrl+shift+q and the keymap for pane close is ctrl+shift+w.

* Fix for failed test on initial commit.
This commit is contained in:
Lucas 2017-09-11 06:09:17 -07:00 committed by Albin Ekblom
parent b5f06759ee
commit 3bca7c2891
2 changed files with 4 additions and 4 deletions

View file

@ -10,7 +10,7 @@
"window:minimize": "ctrl+shift+m", "window:minimize": "ctrl+shift+m",
"window:zoom": "ctrl+shift+alt+m", "window:zoom": "ctrl+shift+alt+m",
"window:toggleFullScreen": "f11", "window:toggleFullScreen": "f11",
"window:close": "ctrl+shift+w", "window:close": "ctrl+shift+q",
"tab:new": "ctrl+shift+t", "tab:new": "ctrl+shift+t",
"tab:next": "ctrl+tab", "tab:next": "ctrl+tab",
"tab:prev": "ctrl+shift+tab", "tab:prev": "ctrl+shift+tab",
@ -18,7 +18,7 @@
"pane:prev": "ctrl+pagedown", "pane:prev": "ctrl+pagedown",
"pane:splitVertical": "ctrl+shift+d", "pane:splitVertical": "ctrl+shift+d",
"pane:splitHorizontal": "ctrl+shift+e", "pane:splitHorizontal": "ctrl+shift+e",
"pane:close": "ctrl+alt+w", "pane:close": "ctrl+shift+w",
"editor:undo": "ctrl+shift+z", "editor:undo": "ctrl+shift+z",
"editor:redo": "ctrl+shift+y", "editor:redo": "ctrl+shift+y",
"editor:cut": "ctrl+shift+x", "editor:cut": "ctrl+shift+x",

View file

@ -10,7 +10,7 @@
"window:minimize": "ctrl+m", "window:minimize": "ctrl+m",
"window:zoom": "ctrl+shift+alt+m", "window:zoom": "ctrl+shift+alt+m",
"window:toggleFullScreen": "f11", "window:toggleFullScreen": "f11",
"window:close": "ctrl+shift+w", "window:close": "ctrl+shift+q",
"tab:new": "ctrl+shift+t", "tab:new": "ctrl+shift+t",
"tab:next": "ctrl+tab", "tab:next": "ctrl+tab",
"tab:prev": "ctrl+shift+tab", "tab:prev": "ctrl+shift+tab",
@ -18,7 +18,7 @@
"pane:prev": "ctrl+pagedown", "pane:prev": "ctrl+pagedown",
"pane:splitVertical": "ctrl+shift+d", "pane:splitVertical": "ctrl+shift+d",
"pane:splitHorizontal": "ctrl+shift+e", "pane:splitHorizontal": "ctrl+shift+e",
"pane:close": "ctrl+alt+w", "pane:close": "ctrl+shift+w",
"editor:undo": "ctrl+shift+z", "editor:undo": "ctrl+shift+z",
"editor:redo": "ctrl+shift+y", "editor:redo": "ctrl+shift+y",
"editor:cut": "ctrl+shift+x", "editor:cut": "ctrl+shift+x",