mirror of
https://github.com/gyurix1968/guacamole-client.git
synced 2025-09-07 13:41:21 +00:00
GUAC-1314: Remove mapping of Mac's Clear to Num Lock.
This commit is contained in:
@@ -610,14 +610,8 @@ Guacamole.Keyboard = function(element) {
|
|||||||
typedCharacter = identifier;
|
typedCharacter = identifier;
|
||||||
|
|
||||||
// Otherwise, look up corresponding keysym
|
// Otherwise, look up corresponding keysym
|
||||||
else {
|
else
|
||||||
// Clear on Mac maps to NumLock
|
|
||||||
if (identifier === "Clear" && is_mac) {
|
|
||||||
identifier = "NumLock";
|
|
||||||
}
|
|
||||||
|
|
||||||
return get_keysym(keyidentifier_keysym[identifier], location);
|
return get_keysym(keyidentifier_keysym[identifier], location);
|
||||||
}
|
|
||||||
|
|
||||||
// Alter case if necessary
|
// Alter case if necessary
|
||||||
if (shifted === true)
|
if (shifted === true)
|
||||||
@@ -653,12 +647,6 @@ Guacamole.Keyboard = function(element) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function keysym_from_keycode(keyCode, location) {
|
function keysym_from_keycode(keyCode, location) {
|
||||||
|
|
||||||
// Map Clear on Mac to NumLock
|
|
||||||
if (keyCode === 12 && is_mac) {
|
|
||||||
keyCode = 144;
|
|
||||||
}
|
|
||||||
|
|
||||||
return get_keysym(keycodeKeysyms[keyCode], location);
|
return get_keysym(keycodeKeysyms[keyCode], location);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -861,9 +849,6 @@ Guacamole.Keyboard = function(element) {
|
|||||||
handled_event = interpret_event();
|
handled_event = interpret_event();
|
||||||
} while (handled_event !== null);
|
} while (handled_event !== null);
|
||||||
|
|
||||||
if (!last_event)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
return last_event.defaultPrevented;
|
return last_event.defaultPrevented;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user