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

Revert "Revert "Fix #3257: ignore modifiers for counts and hints""

Browse source 
This reverts commit 3d2e5bd603.
This commit is contained in:
Oliver Blanthorn 2021-01-29 18:15:12 +01:00
parent 3d2e5bd603
commit 8621188e82
No known key found for this signature in database
GPG key ID: 2BB8C36BB504BFF3
2 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/content/hinting.ts
View file

@ -1214,16 +1214,14 @@ export function parser(keys: keyseq.KeyEventLike[]) {
if (parsed.isMatch === true) {
return parsed
}
// Ignore modifiers since they can't match text
const simplekeys = keys.filter(key => !keyseq.hasModifiers(key))
let exstr
if (simplekeys.length > 1) {
exstr = simplekeys.reduce(
if (keys.length > 1) {
exstr = keys.reduce(
(acc, key) => `hint.pushKey ${key.key};`,
"composite ",
)
} else if (simplekeys.length === 1) {
exstr = `hint.pushKeyCodePoint ${simplekeys[0].key.codePointAt(0)}`
} else if (keys.length === 1) {
exstr = `hint.pushKeyCodePoint ${keys[0].key.codePointAt(0)}`
} else {
return { keys: [], isMatch: false }
}

12
src/lib/keyseq.ts
View file

@ -121,16 +121,10 @@ function splitNumericPrefix(
keyseq: KeyEventLike[],
): [KeyEventLike[], KeyEventLike[]] {
// If the first key is in 1:9, partition all numbers until you reach a non-number.
if (
!hasModifiers(keyseq[0]) &&
[1, 2, 3, 4, 5, 6, 7, 8, 9].includes(Number(keyseq[0].key))
) {
if ([1, 2, 3, 4, 5, 6, 7, 8, 9].includes(Number(keyseq[0].key))) {
const prefix = [keyseq[0]]
for (const ke of keyseq.slice(1)) {
if (
!hasModifiers(ke) &&
[0, 1, 2, 3, 4, 5, 6, 7, 8, 9].includes(Number(ke.key))
)
if ([0, 1, 2, 3, 4, 5, 6, 7, 8, 9].includes(Number(ke.key)))
prefix.push(ke)
else break
}
@ -505,7 +499,7 @@ export function translateKeysUsingKeyTranslateMap(
// }}}
browser.storage.onChanged.addListener((changes) => {
browser.storage.onChanged.addListener(changes => {
if ("userconfig" in changes) {
KEYMAP_CACHE = {}
}