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

Merge pull request #3134 from Rummskartoffel/master

Browse source 
Prevent setURL from setting invalid RegEx patterns
This commit is contained in:
Oliver Blanthorn 2020-12-31 00:34:53 +00:00 • committed by GitHub
commit 5915cdc10f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/lib/config.ts
View file

@ -1142,8 +1142,10 @@ const platform_defaults = {
},
linux: {
nmaps: {
";x": 'hint -F e => { const pos = tri.dom.getAbsoluteCentre(e); tri.excmds.exclaim_quiet("xdotool mousemove --sync " + pos.x + " " + pos.y + "; xdotool click 1")}',
";X": 'hint -F e => { const pos = tri.dom.getAbsoluteCentre(e); tri.excmds.exclaim_quiet("xdotool mousemove --sync " + pos.x + " " + pos.y + "; xdotool keydown ctrl+shift; xdotool click 1; xdotool keyup ctrl+shift")}',
";x":
'hint -F e => { const pos = tri.dom.getAbsoluteCentre(e); tri.excmds.exclaim_quiet("xdotool mousemove --sync " + pos.x + " " + pos.y + "; xdotool click 1")}',
";X":
'hint -F e => { const pos = tri.dom.getAbsoluteCentre(e); tri.excmds.exclaim_quiet("xdotool mousemove --sync " + pos.x + " " + pos.y + "; xdotool keydown ctrl+shift; xdotool click 1; xdotool keyup ctrl+shift")}',
} as unknown,
},
} as Record<browser.runtime.PlatformOs, default_config>
@ -1356,7 +1358,14 @@ export async function pull() {
* Like set(), but for a specific pattern.
*/
export function setURL(pattern, ...args) {
try {
new RegExp(pattern)
return set("subconfigs", pattern, ...args)
} catch (err) {
if (err instanceof SyntaxError)
throw new SyntaxError(`invalid pattern: ${err.message}`)
throw err
}
}
/** Full target specification, then value