diff --git a/.yarnrc b/.yarnrc index 3666616e0b..0ffbd73e54 100644 --- a/.yarnrc +++ b/.yarnrc @@ -1,3 +1,3 @@ disturl "https://atom.io/download/electron" -target "13.4.0" +target "12.2.1" runtime "electron" diff --git a/package.json b/package.json index 525d5c2087..b938acc979 100644 --- a/package.json +++ b/package.json @@ -326,7 +326,7 @@ "css-loader": "^5.2.6", "deepdash": "^5.3.5", "dompurify": "^2.3.1", - "electron": "^13.4.0", + "electron": "^12.2.1", "electron-builder": "^22.10.5", "electron-notarize": "^0.3.0", "esbuild": "^0.12.24", diff --git a/src/main/window-manager.ts b/src/main/window-manager.ts index f751d79790..80e3224fd4 100644 --- a/src/main/window-manager.ts +++ b/src/main/window-manager.ts @@ -109,6 +109,10 @@ export class WindowManager extends Singleton { app.dock?.hide(); // hide icon in dock (mac-os) }) .webContents + .on("new-window", (event, url) => { + event.preventDefault(); + shell.openExternal(url); + }) .on("dom-ready", () => { appEventBus.emit({ name: "app", action: "dom-ready" }); }) @@ -146,10 +150,6 @@ export class WindowManager extends Singleton { // Always disable Node.js integration for all webviews webPreferences.nodeIntegration = false; - }).setWindowOpenHandler((details) => { - shell.openExternal(details.url); - - return { action: "deny" }; }); } diff --git a/yarn.lock b/yarn.lock index a0f22f0e98..081fc44d94 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5269,10 +5269,10 @@ electron@*: "@types/node" "^12.0.12" extract-zip "^1.0.3" -electron@^13.4.0: - version "13.4.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-13.4.0.tgz#f9f9e518d8c6bf23bfa8b69580447eea3ca0f880" - integrity sha512-KJGWS2qa0xZXIMPMDUNkRVO8/JxRd4+M0ejYYOzu2LIQ5ijecPzNuNR9nvDkml9XyyRBzu975FkhJcwD17ietQ== +electron@^12.2.1: + version "12.2.1" + resolved "https://registry.yarnpkg.com/electron/-/electron-12.2.1.tgz#ef138fde11efd01743934c3e0df717cc53ee362b" + integrity sha512-Gp+rO81qoaRDP7PTVtBOvnSgDgGlwUuAEWXxi621uOJMIlYFas9ChXe8pjdL0R0vyUpiHVzp6Vrjx41VZqEpsw== dependencies: "@electron/get" "^1.0.1" "@types/node" "^14.6.2"