Merge branch 'fix/ie11-numpad5-compatibility' of https://github.com/vlastoun/noVNC

diff --git a/core/input/domkeytable.js b/core/input/domkeytable.js
index a0cc1f5a9b48009c6649073bd7f76b6652db01c8..6028801255425fcb5152f98e33755628e655fc45 100644 (file)
--- 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 dc784ffde1dbae0d596eed085e08e1a69a88e25c..d0f6d8e140dde9cc44e7a6f5ffede41476f73915 100644 (file)
--- 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',