diff options
author | Markus Hatvan <markus_hatvan@aon.at> | 2021-09-18 11:15:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-18 11:15:25 +0200 |
commit | d4101a48b3eee8b1fb177831aa02a4b4fbec2588 (patch) | |
tree | c92f2fbe91197fde8589207463d0d6526b4ff76b /src/electron | |
parent | 5.6.3-nightly.6 [skip ci] (diff) | |
download | ferdium-app-d4101a48b3eee8b1fb177831aa02a4b4fbec2588.tar.gz ferdium-app-d4101a48b3eee8b1fb177831aa02a4b4fbec2588.tar.zst ferdium-app-d4101a48b3eee8b1fb177831aa02a4b4fbec2588.zip |
chore: convert various files from JS to TS (#1959)
Diffstat (limited to 'src/electron')
-rw-r--r-- | src/electron/ipc-api/localServer.ts | 4 | ||||
-rw-r--r-- | src/electron/macOSPermissions.ts | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/electron/ipc-api/localServer.ts b/src/electron/ipc-api/localServer.ts index d318b93a5..61e56c777 100644 --- a/src/electron/ipc-api/localServer.ts +++ b/src/electron/ipc-api/localServer.ts | |||
@@ -2,7 +2,7 @@ import { ipcMain, BrowserWindow } from 'electron'; | |||
2 | import net from 'net'; | 2 | import net from 'net'; |
3 | import { LOCAL_HOSTNAME, LOCAL_PORT } from '../../config'; | 3 | import { LOCAL_HOSTNAME, LOCAL_PORT } from '../../config'; |
4 | import { userDataPath } from '../../environment'; | 4 | import { userDataPath } from '../../environment'; |
5 | import startServer from '../../internal-server/start'; | 5 | import { server } from '../../internal-server/start'; |
6 | 6 | ||
7 | const portInUse = (port: number): Promise<boolean> => | 7 | const portInUse = (port: number): Promise<boolean> => |
8 | new Promise(resolve => { | 8 | new Promise(resolve => { |
@@ -35,7 +35,7 @@ export default (params: { mainWindow: BrowserWindow }) => { | |||
35 | } | 35 | } |
36 | console.log('Starting local server on port', port); | 36 | console.log('Starting local server on port', port); |
37 | 37 | ||
38 | startServer(userDataPath(), port); | 38 | server(userDataPath(), port); |
39 | 39 | ||
40 | params.mainWindow.webContents.send('localServerPort', { | 40 | params.mainWindow.webContents.send('localServerPort', { |
41 | port, | 41 | port, |
diff --git a/src/electron/macOSPermissions.ts b/src/electron/macOSPermissions.ts index f5a8c7cc4..aef3ac30b 100644 --- a/src/electron/macOSPermissions.ts +++ b/src/electron/macOSPermissions.ts | |||
@@ -15,7 +15,7 @@ debug( | |||
15 | 15 | ||
16 | const filePath = userDataPath('.has-app-requested-screen-capture-permissions'); | 16 | const filePath = userDataPath('.has-app-requested-screen-capture-permissions'); |
17 | 17 | ||
18 | function hasPromptedForScreenCapturePermission(): boolean { | 18 | function hasPromptedForScreenCapturePermission(): string | boolean { |
19 | if (!isExplicitScreenCapturePermissionReqd) { | 19 | if (!isExplicitScreenCapturePermissionReqd) { |
20 | return false; | 20 | return false; |
21 | } | 21 | } |