From 0d6d623d1e34cdbff2d46229165b49289a9a0619 Mon Sep 17 00:00:00 2001 From: Bennett Date: Sun, 21 Jun 2020 09:19:59 +0200 Subject: Add FAB to service dashboard (#824) * Implement #387 * Fix lint * Upgrade to Electron 9 * Remove dependency on electron-spellchecker * Allow multiple languages to be selected * Fix lint * Don't show spellchecker language chooser for macOS * Fix _requireAuthenticatedUser throwing error on startup * Add FAB --- src/electron/ipc-api/settings.js | 4 +++- src/electron/webview-ime-focus.js | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src/electron') diff --git a/src/electron/ipc-api/settings.js b/src/electron/ipc-api/settings.js index b651db306..6d48c54e3 100644 --- a/src/electron/ipc-api/settings.js +++ b/src/electron/ipc-api/settings.js @@ -2,9 +2,11 @@ import { ipcMain } from 'electron'; export default (params) => { ipcMain.on('getAppSettings', (event, type) => { + const cleanData = JSON.parse(JSON.stringify(params.settings[type].all)); + params.mainWindow.webContents.send('appSettings', { type, - data: params.settings[type].all, + data: cleanData, }); }); diff --git a/src/electron/webview-ime-focus.js b/src/electron/webview-ime-focus.js index 1213b518e..b41232b63 100644 --- a/src/electron/webview-ime-focus.js +++ b/src/electron/webview-ime-focus.js @@ -1,3 +1,4 @@ +const { remote } = require('electron'); const { releaseDocumentFocus } = require('./webview-ime-focus-helpers'); function giveWebviewDocumentFocus(element) { @@ -9,7 +10,7 @@ function giveWebviewDocumentFocus(element) { } function elementIsUnfocusedWebview(element) { - return element.tagName === 'WEBVIEW' && !element.getWebContents().isFocused(); + return element.tagName === 'WEBVIEW' && !remote.webContents.fromId(element.getWebContentsId()).isFocused(); } function webviewDidAutofocus(element) { -- cgit v1.2.3-54-g00ecf