hiro/tridactyl
1
0
Fork 0
mirror of https://github.com/vale981/tridactyl synced 2025-03-05 09:31:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some probable bugs

Browse source
This commit is contained in:
Oliver Blanthorn 2023-06-11 17:45:17 +02:00
parent b0beae23ad
commit c2e0ec6e42
No known key found for this signature in database
GPG key ID: 2BB8C36BB504BFF3
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/lib/keyseq.ts
View file

@ -77,7 +77,6 @@ export class MinimalKey {
readonly keyup = false // keyup == false <=> it is a keydown event
readonly keydown = false // explicit keydown <=> it is not a repeat event
readonly optional = false
readonly repeat = false
constructor(readonly key: string, modifiers?: KeyModifiers) {
if (modifiers !== undefined) {
@ -97,11 +96,7 @@ export class MinimalKey {
public match(keyevent: MinimalKey): true | false | "skip" {
if (this.key !== keyevent.key) return false
for (const [_, attr] of modifiers.entries()) {
if (attr === "keydown") {
if (this[attr] && keyevent.repeat) return false // if keydown is set to true, match only if repeat is false
continue
}
if (attr === "optional") { // this should probably go around line 20?
if (attr === "optional") { // this should probably go around line 85?
continue
}
if (this[attr] !== keyevent[attr]) {
@ -120,6 +115,9 @@ export class MinimalKey {
ctrlKey: this.ctrlKey,
metaKey: this.metaKey,
shiftKey: this.shiftKey,
keyup: this.keyup,
keydown: this.keyup,
optional: this.optional,
})
result.translated = true
return result
@ -451,6 +449,9 @@ export function mozMapToMinimalKey(mozmap: string): MinimalKey {
ctrlKey: arr.includes("MacCtrl"), // MacCtrl gives us _actual_ ctrl on all platforms rather than splat on Mac and Ctrl everywhere else
shiftKey: arr.includes("Shift"),
metaKey: arr.includes("Command"),
keydown: false,
keyup: false,
optional: false,
}
let key = arr[arr.length - 1]
key = R.propOr(key.toLowerCase(), key, commandKey2jsKey)