From 79074555e4444588e589f86058162f818d1f27df Mon Sep 17 00:00:00 2001 From: Manav Mehta Date: Mon, 22 Jun 2020 14:03:44 +0530 Subject: [PATCH] Replace deprecated APIs --- app/renderer/js/components/webview.ts | 2 +- app/renderer/js/main.ts | 6 ++--- app/renderer/js/tray.ts | 2 +- app/renderer/js/utils/link-util.ts | 36 +++++++++++++-------------- package-lock.json | 6 ++--- package.json | 2 +- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/app/renderer/js/components/webview.ts b/app/renderer/js/components/webview.ts index f0fd8f3d9..860996b86 100644 --- a/app/renderer/js/components/webview.ts +++ b/app/renderer/js/components/webview.ts @@ -216,7 +216,7 @@ export default class WebView extends BaseComponent { focus(): void { // Focus Webview and it's contents when Window regain focus. - const webContents = this.$el.getWebContents(); + const webContents = remote.webContents.fromId(this.$el.getWebContentsId()); // HACK: webContents.isFocused() seems to be true even without the element // being in focus. So, we check against `document.activeElement`. if (webContents && this.$el !== document.activeElement) { diff --git a/app/renderer/js/main.ts b/app/renderer/js/main.ts index fcd14ef1c..728423296 100644 --- a/app/renderer/js/main.ts +++ b/app/renderer/js/main.ts @@ -717,7 +717,7 @@ class ServerManagerView { updateGeneralSettings(setting: string, value: unknown): void { if (this.getActiveWebview()) { - const webContents = this.getActiveWebview().getWebContents(); + const webContents = remote.webContents.fromId(this.getActiveWebview().getWebContentsId()); webContents.send(setting, value); } } @@ -917,7 +917,7 @@ class ServerManagerView { ipcRenderer.on('toggle-dnd', (event: Event, state: boolean, newSettings: DNDSettings) => { this.toggleDNDButton(state); ipcRenderer.send('forward-message', 'toggle-silent', newSettings.silent); - const webContents = this.getActiveWebview().getWebContents(); + const webContents = remote.webContents.fromId(this.getActiveWebview().getWebContentsId()); webContents.send('toggle-dnd', state, newSettings); }); @@ -969,7 +969,7 @@ class ServerManagerView { ipcRenderer.on('focus-webview-with-id', (event: Event, webviewId: number) => { const webviews: NodeListOf = document.querySelectorAll('webview'); webviews.forEach(webview => { - const currentId = webview.getWebContents().id; + const currentId = webview.getWebContentsId(); const tabId = webview.getAttribute('data-tab-id'); const concurrentTab: HTMLButtonElement = document.querySelector(`div[data-tab-id="${tabId}"]`); if (currentId === webviewId) { diff --git a/app/renderer/js/tray.ts b/app/renderer/js/tray.ts index 3492f3c59..e0345213c 100644 --- a/app/renderer/js/tray.ts +++ b/app/renderer/js/tray.ts @@ -207,7 +207,7 @@ function toggleTray(): void { const selector = 'webview:not([class*=disabled])'; const webview: WebviewTag = document.querySelector(selector); - const webContents = webview.getWebContents(); + const webContents = remote.webContents.fromId(webview.getWebContentsId()); webContents.send('toggletray', state); } diff --git a/app/renderer/js/utils/link-util.ts b/app/renderer/js/utils/link-util.ts index 10fad7fea..80295bbed 100644 --- a/app/renderer/js/utils/link-util.ts +++ b/app/renderer/js/utils/link-util.ts @@ -19,24 +19,24 @@ export async function openBrowser(url: URL): Promise { ); const file = path.join(dir, 'redirect.html'); fs.writeFileSync(file, `\ - - - - - - Redirecting - - - -

Opening ${escape(url.href)}…

- - -`); - shell.openItem(file); + + + + + + Redirecting + + + +

Opening ${escape(url.href)}…

+ + + `); + await shell.openExternal(file); // Check setTimeout(() => { fs.unlinkSync(file); fs.rmdirSync(dir); diff --git a/package-lock.json b/package-lock.json index e829fcd05..8fa3578dc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3151,9 +3151,9 @@ } }, "electron": { - "version": "8.3.3", - "resolved": "https://registry.npmjs.org/electron/-/electron-8.3.3.tgz", - "integrity": "sha512-/LGnjnE9BQzkn2VpjflLi7jpQxYIp+maqmiDPy6ww76hkQvt/LJ991ewdHpfLR4or3VqzPIu+AK+ZJrTlDAWyw==", + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/electron/-/electron-9.0.4.tgz", + "integrity": "sha512-QzkeZNAiNB7KxcdoQKSoaiVT/GQdB4Vt0/ZZOuU8tIKABAsni2I7ztiAbUzxcsnQsqEBSfChuPuDQ5A4VbbzPg==", "dev": true, "requires": { "@electron/get": "^1.0.1", diff --git a/package.json b/package.json index 8d0a62abe..96ce53e44 100644 --- a/package.json +++ b/package.json @@ -181,7 +181,7 @@ "@typescript-eslint/parser": "^2.30.0", "devtron": "^1.4.0", "dotenv": "^8.2.0", - "electron": "^8.3.3", + "electron": "^9.0.4", "electron-builder": "^22.6.0", "electron-connect": "^0.6.3", "electron-notarize": "^0.3.0",