Merge branch 'master' into release_41

xtermjs · Oct 7, 2019 · da5bf97 · da5bf97
2 parents 22398c0 + 43b2911
commit da5bf97
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
     "ts-loader": "^6.0.4",
     "tslint": "^5.18.0",
     "tslint-consistent-codestyle": "^1.13.0",
-    "typescript": "3.5",
+    "typescript": "3.6",
     "utf8": "^3.0.0",
     "webpack": "^4.35.3",
     "webpack-cli": "^3.1.0",

diff --git a/src/common/input/Keyboard.ts b/src/common/input/Keyboard.ts
@@ -113,6 +113,9 @@ export function evaluateKeyboardEvent(
       break;
     case 37:
       // left-arrow
+      if (ev.metaKey) {
+        break;
+      }
       if (modifiers) {
         result.key = C0.ESC + '[1;' + (modifiers + 1) + 'D';
         // HACK: Make Alt + left-arrow behave like Ctrl + left-arrow: move one word backwards
@@ -129,6 +132,9 @@ export function evaluateKeyboardEvent(
       break;
     case 39:
       // right-arrow
+      if (ev.metaKey) {
+        break;
+      }
       if (modifiers) {
         result.key = C0.ESC + '[1;' + (modifiers + 1) + 'C';
         // HACK: Make Alt + right-arrow behave like Ctrl + right-arrow: move one word forward
@@ -145,6 +151,9 @@ export function evaluateKeyboardEvent(
       break;
     case 38:
       // up-arrow
+      if (ev.metaKey) {
+        break;
+      }
       if (modifiers) {
         result.key = C0.ESC + '[1;' + (modifiers + 1) + 'A';
         // HACK: Make Alt + up-arrow behave like Ctrl + up-arrow
@@ -160,6 +169,9 @@ export function evaluateKeyboardEvent(
       break;
     case 40:
       // down-arrow
+      if (ev.metaKey) {
+        break;
+      }
       if (modifiers) {
         result.key = C0.ESC + '[1;' + (modifiers + 1) + 'B';
         // HACK: Make Alt + down-arrow behave like Ctrl + down-arrow

diff --git a/yarn.lock b/yarn.lock
@@ -4719,7 +4719,12 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-[email protected], typescript@^3.5.1:
+[email protected]:
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.3.tgz#fea942fabb20f7e1ca7164ff626f1a9f3f70b4da"
+  integrity sha512-N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw==
+
+typescript@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.1.tgz#ba72a6a600b2158139c5dd8850f700e231464202"
   integrity sha512-64HkdiRv1yYZsSe4xC1WVgamNigVYjlssIoaH2HcZF0+ijsk5YK2g0G34w9wJkze8+5ow4STd22AynfO6ZYYLw==