summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2020-12-22 17:59:13 +0100
committerOskar Nyberg <oskar@mullvad.net>2021-01-26 09:06:54 +0100
commitcdfa833719aae00f56295cbfde9feec45f24d2f1 (patch)
tree82b3f7e969dc7f96495ec93290663b6447a050e2
parent3061a1d584b6434aef07d86745841d4828f78a11 (diff)
downloadmullvadvpn-cdfa833719aae00f56295cbfde9feec45f24d2f1.tar.xz
mullvadvpn-cdfa833719aae00f56295cbfde9feec45f24d2f1.zip
Add IpcRendererEventChannel to window
-rw-r--r--gui/src/renderer/app.tsx4
-rw-r--r--gui/src/renderer/preload.ts2
-rw-r--r--gui/types/global/index.d.ts2
3 files changed, 7 insertions, 1 deletions
diff --git a/gui/src/renderer/app.tsx b/gui/src/renderer/app.tsx
index 716e5c88e3..a877c7aacb 100644
--- a/gui/src/renderer/app.tsx
+++ b/gui/src/renderer/app.tsx
@@ -18,7 +18,7 @@ import versionActions from './redux/version/actions';
import { ICurrentAppVersionInfo } from '../main';
import { messages, relayLocations } from '../shared/gettext';
import { IGuiSettingsState, SYSTEM_PREFERRED_LOCALE_KEY } from '../shared/gui-settings-state';
-import { IpcRendererEventChannel, IRelayListPair } from '../shared/ipc-event-channel';
+import { IRelayListPair } from '../shared/ipc-event-channel';
import { ILinuxSplitTunnelingApplication } from '../shared/application-types';
import log, { ConsoleOutput } from '../shared/logging';
import consumePromise from '../shared/promise';
@@ -45,6 +45,8 @@ import {
import { LogLevel } from '../shared/logging-types';
import IpcOutput from './lib/logging';
+const IpcRendererEventChannel = window.ipc;
+
interface IPreferredLocaleDescriptor {
name: string;
code: string;
diff --git a/gui/src/renderer/preload.ts b/gui/src/renderer/preload.ts
index 4732b792a6..2eacea5b8c 100644
--- a/gui/src/renderer/preload.ts
+++ b/gui/src/renderer/preload.ts
@@ -1,3 +1,5 @@
import { loadTranslations } from '../shared/gettext';
+import { IpcRendererEventChannel } from '../shared/ipc-event-channel';
window.loadTranslations = (locale, catalogue) => loadTranslations(locale, catalogue);
+window.ipc = IpcRendererEventChannel;
diff --git a/gui/types/global/index.d.ts b/gui/types/global/index.d.ts
index 870d164379..4245afeba0 100644
--- a/gui/types/global/index.d.ts
+++ b/gui/types/global/index.d.ts
@@ -1,7 +1,9 @@
import Gettext from 'node-gettext';
+import { IpcRendererEventChannel } from '../../src/shared/ipc-event-channel';
declare global {
interface Window {
loadTranslations(locale: string, catalogue: Gettext): void;
+ ipc: typeof IpcRendererEventChannel;
}
}