RageStudio/comty
1
0
Fork 0
mirror of https://github.com/ragestudio/comty.git synced 2025-06-10 02:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix preventDefault

Browse Source
This commit is contained in:
srgooglo 2022-03-15 03:11:16 +01:00
parent 3586ba9d8b
commit 8b165ae8d3
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/app/src/App.jsx
View File

@ -286,6 +286,7 @@ class App {
window.app.ShortcutsController.register({ window.app.ShortcutsController.register({
key: ",", key: ",",
meta: true, meta: true,
preventDefault: true,
}, (...args) => { }, (...args) => {
App.publicMethods.openSettings(...args) App.publicMethods.openSettings(...args)
}) })
@ -293,6 +294,7 @@ class App {
window.app.ShortcutsController.register({ window.app.ShortcutsController.register({
key: ",", key: ",",
ctrl: true, ctrl: true,
preventDefault: true,
}, (...args) => { }, (...args) => {
App.publicMethods.openSettings(...args) App.publicMethods.openSettings(...args)
}) })

10
packages/app/src/extensions/shortcuts/index.js
View File

@ -8,8 +8,6 @@ export class ShortcutsController {
const shortcut = this.shortcuts[key] const shortcut = this.shortcuts[key]
if (shortcut) { if (shortcut) {
event.preventDefault()
if (typeof shortcut.ctrl === "boolean" && event.ctrlKey !== shortcut.ctrl) { if (typeof shortcut.ctrl === "boolean" && event.ctrlKey !== shortcut.ctrl) {
return return
} }
@ -17,14 +15,18 @@ export class ShortcutsController {
if (typeof shortcut.shift === "boolean" && event.shiftKey !== shortcut.shift) { if (typeof shortcut.shift === "boolean" && event.shiftKey !== shortcut.shift) {
return return
} }
if (typeof shortcut.alt === "boolean" && event.altKey !== shortcut.alt) { if (typeof shortcut.alt === "boolean" && event.altKey !== shortcut.alt) {
return return
} }
if (typeof shortcut.meta === "boolean" && event.metaKey !== shortcut.meta) { if (typeof shortcut.meta === "boolean" && event.metaKey !== shortcut.meta) {
return return
} }
if (shortcut.preventDefault) {
event.preventDefault()
}
if (typeof shortcut.fn === "function") { if (typeof shortcut.fn === "function") {
shortcut.fn() shortcut.fn()