Merge pull request #155 from Tyriar/154_fix_resize_at_top_exception

[mirror_xterm.js.git] / src / xterm.js

diff --git a/src/xterm.js b/src/xterm.js
index 6d77cbe85938bb4c2a2507f48195500a1e42dcff..8e699b99d376f73eff20beb469e2a1e718a55bec 100644 (file)
--- a/src/xterm.js
+++ b/src/xterm.js
@@ -552,8 +552,8 @@
 
       /**
        * Hack pasting with keyboard, in order to make it work without contentEditable.
-       * When a user types Ctrl + Shift + V or Cmd + V on a Mac, lease the contentEditable value
-       * as true.
+       * When a user types Ctrl + Shift + V or Shift + Insert on a non Mac or Cmd + V on a Mac,
+       * lease the contentEditable value as true.
        */
       on(term.element, 'keydown', function (ev) {
         var isEditable = term.element.contentEditable === "true";
@@ -566,9 +566,11 @@
           term.leaseContentEditable(5000);
         }
 
-        if (!term.isMac && ev.keyCode == 45 && ev.shiftKey && !ev.ctrlKey && !isEditable) {
-          // Shift + Insert pastes on windows and many linuxes
-          term.leaseContentEditable();
+        if (!term.isMac && !isEditable) {
+          if ((ev.keyCode == 45 && ev.shiftKey && !ev.ctrlKey) ||  // Shift + Insert
+              (ev.keyCode == 86 && ev.shiftKey && ev.ctrlKey)) {  // Ctrl + Shict + V
+            term.leaseContentEditable();
+          }
         }
       });