Merge pull request #497 from learn-co/scroll

Include legacy scroll shortcut on Mac
learn-co · Jun 21, 2017 · 5ebcf89 · 5ebcf89
2 parents 4d999cb + ed5c635
commit 5ebcf89
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/keymaps/learn-ide.json b/keymaps/learn-ide.json
@@ -14,7 +14,9 @@
     "cmd--": "learn-ide:decrease-font-size",
     "cmd-0": "learn-ide:reset-font-size",
     "cmd-up": "learn-ide:scroll-up",
-    "cmd-down": "learn-ide:scroll-down"
+    "cmd-down": "learn-ide:scroll-down",
+    "ctrl-alt-up": "learn-ide:scroll-up",
+    "ctrl-alt-down": "learn-ide:scroll-down"
   },
   ".platform-win32 .terminal, .platform-linux .terminal": {
     "ctrl-=": "learn-ide:increase-font-size",

diff --git a/lib/terminal-view.js b/lib/terminal-view.js
@@ -88,13 +88,16 @@ class TerminalView extends View {
     return ctrlKey && (keyCode === 83) && (process.platform !== 'darwin')
   }
 
-  isAttemptToScroll({keyCode, ctrlKey, metaKey}) {
+  isAttemptToScroll({keyCode, ctrlKey, metaKey, altKey}) {
     var isUpOrDown = [38, 40].includes(keyCode);
 
     if (!isUpOrDown) { return false }
 
-    // cmd-up/down on mac, or ctrl-up/down on windows and linux
-    return process.platform === 'darwin' ? metaKey : ctrlKey
+    // ctrl-up/down on windows and linux
+    if (process.platform !== 'darwin') { return ctrlKey }
+
+    // cmd-up/down or ctrl-alt-up/down on mac
+    return metaKey || (ctrlKey && altKey)
   }
 
   loadPopoutEmulator() {