OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #16405 from vector-im/jryans/electron-type-merge 

Fix Electron type merging
pull/16408/head
J. Ryan Stinnett 2021-02-08 15:25:19 +00:00 committed by GitHub
parent 9f4d75f2ed 993c2e50b5
commit e562c54ddc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/@types/global.d.ts vendored
View File

@ -39,18 +39,20 @@ declare global {
matrixChat: ReturnType<Renderer>; matrixChat: ReturnType<Renderer>;
// electron-only // electron-only
electron: { electron?: Electron;
on(channel: ElectronChannel, listener: (event: Event, ...args: any[]) => void): void;
send(channel: ElectronChannel, ...args: any[]): void;
}
// opera-only // opera-only
opera: any; opera?: any;
// https://developer.mozilla.org/en-US/docs/Web/API/InstallTrigger // https://developer.mozilla.org/en-US/docs/Web/API/InstallTrigger
InstallTrigger: any; InstallTrigger: any;
} }
interface Electron {
on(channel: ElectronChannel, listener: (event: Event, ...args: any[]) => void): void;
send(channel: ElectronChannel, ...args: any[]): void;
}
interface Navigator { interface Navigator {
// PWA badging extensions https://w3c.github.io/badging/ // PWA badging extensions https://w3c.github.io/badging/
setAppBadge?(count: number): Promise<void>; setAppBadge?(count: number): Promise<void>;