summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2018-07-04 15:53:30 +0200
committerPierre Ossman <ossman@cendio.se>2018-07-04 15:53:30 +0200
commit8acadd9e972b72eb5667e397c9dac07feca78949 (patch)
tree98aea0cf5aae8bd4ec4d50c3233aa77f8e40242a
parent9700e3592bc6d645146e75614670717a6d46400d (diff)
parent5858f472e3bf012cbffa5fbe449a2a237755da0b (diff)
downloadnovnc-8acadd9e972b72eb5667e397c9dac07feca78949.tar.gz
Merge branch 'fix/ie11-numpad5-compatibility' of https://github.com/vlastoun/noVNC
-rw-r--r--core/input/domkeytable.js2
-rw-r--r--core/input/vkeys.js1
2 files changed, 2 insertions, 1 deletions
diff --git a/core/input/domkeytable.js b/core/input/domkeytable.js
index a0cc1f5..6028801 100644
--- a/core/input/domkeytable.js
+++ b/core/input/domkeytable.js
@@ -75,7 +75,7 @@ addNumpad("PageUp", KeyTable.XK_Prior, KeyTable.XK_KP_Prior);
// 2.5. Editing Keys
addStandard("Backspace", KeyTable.XK_BackSpace);
-addStandard("Clear", KeyTable.XK_Clear);
+addNumpad("Clear", KeyTable.XK_Clear, KeyTable.XK_KP_Begin);
addStandard("Copy", KeyTable.XF86XK_Copy);
// - CrSel
addStandard("Cut", KeyTable.XF86XK_Cut);
diff --git a/core/input/vkeys.js b/core/input/vkeys.js
index dc784ff..d0f6d8e 100644
--- a/core/input/vkeys.js
+++ b/core/input/vkeys.js
@@ -58,6 +58,7 @@ export default {
0x63: 'Numpad3',
0x64: 'Numpad4',
0x65: 'Numpad5',
+ 0x0c: 'Numpad5', // IE11 sends evt.keyCode: 12 when numlock is off
0x66: 'Numpad6',
0x67: 'Numpad7',
0x68: 'Numpad8',