GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-06-24 13:29:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed hotkey race condition

Browse Source
This commit is contained in:
Eugene Pankov 2021-08-08 17:54:53 +02:00
parent 79de7ec015
commit 434bacf185
No known key found for this signature in database
GPG Key ID: 5896FCBBDD1CF4F4
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tabby-core/src/services/hotkeys.service.ts
View File

@ -72,20 +72,21 @@ export class HotkeysService {
@Inject(HotkeyProvider) private hotkeyProviders: HotkeyProvider[], @Inject(HotkeyProvider) private hotkeyProviders: HotkeyProvider[],
hostApp: HostAppService, hostApp: HostAppService,
) { ) {
const events = ['keydown', 'keyup']
events.forEach(eventType => {
document.addEventListener(eventType, (nativeEvent: KeyboardEvent) => {
this._keyEvent.next(nativeEvent)
this.pushKeyEvent(eventType, nativeEvent)
if (hostApp.platform === Platform.Web && this.matchActiveHotkey(true) !== null) {
nativeEvent.preventDefault()
nativeEvent.stopPropagation()
}
})
})
this.config.ready$.toPromise().then(async () => { this.config.ready$.toPromise().then(async () => {
const hotkeys = await this.getHotkeyDescriptions() const hotkeys = await this.getHotkeyDescriptions()
this.hotkeyDescriptions = hotkeys this.hotkeyDescriptions = hotkeys
const events = ['keydown', 'keyup']
events.forEach(eventType => {
document.addEventListener(eventType, (nativeEvent: KeyboardEvent) => {
this._keyEvent.next(nativeEvent)
this.pushKeyEvent(eventType, nativeEvent)
if (hostApp.platform === Platform.Web && this.matchActiveHotkey(true) !== null) {
nativeEvent.preventDefault()
nativeEvent.stopPropagation()
}
})
})
}) })
// deprecated // deprecated