Skip to content

Commit f06b7c7

Browse files
Merge pull request #71 from a-liashenko/feature/update_electron
Fix openExternal in renderer process
2 parents 85e7047 + f2ef5e0 commit f06b7c7

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

src/ipc/channels.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ exports.Channels = {
44
FetchHashtags: 'app/fetch/hashtags',
55
Log: 'app/log',
66
StoreGet: 'app/store/get',
7-
StoreGetMultiple: 'app/store/get_multi',
7+
StoreGetMultiple: 'app/store/getMulti',
8+
OpenExternalUrl: 'app/shell/openExternalUrl',
89
};

src/ipc/main.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { ipcMain, BrowserWindow } = require('electron');
1+
const { ipcMain, BrowserWindow, shell } = require('electron');
22
const logger = require('../logger');
33
const store = require('../store');
44

@@ -27,6 +27,10 @@ ipcMain.handle(Channels.StoreGetMultiple, async (event, ...args) => {
2727
return Promise.resolve(result);
2828
});
2929

30+
ipcMain.on(Channels.OpenExternalUrl, async (event, url) => {
31+
shell.openExternal(url);
32+
});
33+
3034
ipcMain.on(Channels.Log, async (event, level, ...args) => {
3135
const levels = { log: logger.log, warn: logger.warn };
3236
let fn = levels[level] || logger.log;

src/preload.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { ipcRenderer, shell, contextBridge } = require('electron');
1+
const { ipcRenderer, contextBridge } = require('electron');
22
const utils = require('./ipc/renderer');
33
const { Channels } = require('./ipc/channels');
44

@@ -10,7 +10,9 @@ function logGeneric(level, ...args) {
1010

1111
const context = {
1212
electron: {
13-
shell,
13+
shell: {
14+
openExternal: (url) => ipcRenderer.send(Channels.OpenExternalUrl, url),
15+
},
1416
ipcRenderer: {
1517
send: ipcRenderer.send,
1618
invoke: ipcRenderer.invoke,

0 commit comments

Comments
 (0)