GUACAMOLE-1055: Merge Russian OSK support for Latin characters.

This commit is contained in:
Mike Jumper
2021-02-20 21:35:54 -08:00
committed by GitHub
3 changed files with 195 additions and 46 deletions

View File

@@ -307,13 +307,13 @@ Guacamole.OnScreenKeyboard = function(layout) {
var originalKeysym = modifierKeysyms[key.modifier];
// Activate modifier if not pressed
if (!originalKeysym) {
if (originalKeysym === undefined) {
addClass(keyboard, modifierClass);
modifierKeysyms[key.modifier] = key.keysym;
// Send key event
if (osk.onkeydown)
// Send key event only if keysym is meaningful
if (key.keysym && osk.onkeydown)
osk.onkeydown(key.keysym);
}
@@ -324,8 +324,8 @@ Guacamole.OnScreenKeyboard = function(layout) {
removeClass(keyboard, modifierClass);
delete modifierKeysyms[key.modifier];
// Send key event
if (osk.onkeyup)
// Send key event only if original keysym is meaningful
if (originalKeysym && osk.onkeyup)
osk.onkeyup(originalKeysym);
}