aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar Vijay Raghavan Aravamudhan <vraravam@users.noreply.github.com>2021-09-05 17:59:28 +0530
committerLibravatar GitHub <noreply@github.com>2021-09-05 17:59:28 +0530
commitc40e50274ec326d29d3373fa3b346b1f29cf8b95 (patch)
tree1a652c89551c2120eec57c2d7e7e19bd3c86ed83 /src
parentdocs: Updated CHANGELOG.md [skip ci] (diff)
downloadferdium-app-c40e50274ec326d29d3373fa3b346b1f29cf8b95.tar.gz
ferdium-app-c40e50274ec326d29d3373fa3b346b1f29cf8b95.tar.zst
ferdium-app-c40e50274ec326d29d3373fa3b346b1f29cf8b95.zip
Expose some functions to the recipe child processes (#1869)
* chore: expose some functions to the recipe child processes so as to bypass the need for the recipe to require '@electron/remote'
Diffstat (limited to 'src')
-rw-r--r--src/webview/recipe.js8
-rw-r--r--src/webview/spellchecker.ts6
2 files changed, 10 insertions, 4 deletions
diff --git a/src/webview/recipe.js b/src/webview/recipe.js
index 1981c8731..10fdbe606 100644
--- a/src/webview/recipe.js
+++ b/src/webview/recipe.js
@@ -1,5 +1,6 @@
1/* eslint-disable import/first */ 1/* eslint-disable import/first */
2import { contextBridge, ipcRenderer } from 'electron'; 2import { contextBridge, desktopCapturer, ipcRenderer } from 'electron';
3import { BrowserWindow, getCurrentWebContents } from '@electron/remote';
3import { join } from 'path'; 4import { join } from 'path';
4import { autorun, computed, observable } from 'mobx'; 5import { autorun, computed, observable } from 'mobx';
5import { pathExistsSync, readFileSync } from 'fs-extra'; 6import { pathExistsSync, readFileSync } from 'fs-extra';
@@ -107,6 +108,11 @@ contextBridge.exposeInMainWorld('ferdi', {
107 displayNotification: (title, options) => 108 displayNotification: (title, options) =>
108 notificationsHandler.displayNotification(title, options), 109 notificationsHandler.displayNotification(title, options),
109 getDisplayMediaSelector, 110 getDisplayMediaSelector,
111 getCurrentWebContents,
112 BrowserWindow,
113 ipcRenderer,
114 // TODO: When the discord recipe is changed to use the screenshare.js, this can be removed
115 desktopCapturer,
110}); 116});
111 117
112ipcRenderer.sendToHost( 118ipcRenderer.sendToHost(
diff --git a/src/webview/spellchecker.ts b/src/webview/spellchecker.ts
index aa9a2350f..30b4ef075 100644
--- a/src/webview/spellchecker.ts
+++ b/src/webview/spellchecker.ts
@@ -4,8 +4,8 @@ import { DEFAULT_APP_SETTINGS, isMac } from '../environment';
4 4
5const debug = require('debug')('Ferdi:spellchecker'); 5const debug = require('debug')('Ferdi:spellchecker');
6 6
7const webContents = getCurrentWebContents(); 7const { session } = getCurrentWebContents();
8const [defaultLocale] = webContents.session.getSpellCheckerLanguages(); 8const [defaultLocale] = session.getSpellCheckerLanguages();
9debug('Spellchecker default locale is', defaultLocale); 9debug('Spellchecker default locale is', defaultLocale);
10 10
11export function getSpellcheckerLocaleByFuzzyIdentifier(identifier: string) { 11export function getSpellcheckerLocaleByFuzzyIdentifier(identifier: string) {
@@ -31,5 +31,5 @@ export function switchDict(locale: string) {
31 31
32 locales.push(defaultLocale, DEFAULT_APP_SETTINGS.fallbackLocale); 32 locales.push(defaultLocale, DEFAULT_APP_SETTINGS.fallbackLocale);
33 33
34 webContents.session.setSpellCheckerLanguages(locales); 34 session.setSpellCheckerLanguages(locales);
35} 35}