diff options
Diffstat (limited to 'src/electron')
-rw-r--r-- | src/electron/ipc-api/settings.js | 4 | ||||
-rw-r--r-- | src/electron/webview-ime-focus.js | 3 |
2 files changed, 5 insertions, 2 deletions
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'; | |||
2 | 2 | ||
3 | export default (params) => { | 3 | export default (params) => { |
4 | ipcMain.on('getAppSettings', (event, type) => { | 4 | ipcMain.on('getAppSettings', (event, type) => { |
5 | const cleanData = JSON.parse(JSON.stringify(params.settings[type].all)); | ||
6 | |||
5 | params.mainWindow.webContents.send('appSettings', { | 7 | params.mainWindow.webContents.send('appSettings', { |
6 | type, | 8 | type, |
7 | data: params.settings[type].all, | 9 | data: cleanData, |
8 | }); | 10 | }); |
9 | }); | 11 | }); |
10 | 12 | ||
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 @@ | |||
1 | const { remote } = require('electron'); | ||
1 | const { releaseDocumentFocus } = require('./webview-ime-focus-helpers'); | 2 | const { releaseDocumentFocus } = require('./webview-ime-focus-helpers'); |
2 | 3 | ||
3 | function giveWebviewDocumentFocus(element) { | 4 | function giveWebviewDocumentFocus(element) { |
@@ -9,7 +10,7 @@ function giveWebviewDocumentFocus(element) { | |||
9 | } | 10 | } |
10 | 11 | ||
11 | function elementIsUnfocusedWebview(element) { | 12 | function elementIsUnfocusedWebview(element) { |
12 | return element.tagName === 'WEBVIEW' && !element.getWebContents().isFocused(); | 13 | return element.tagName === 'WEBVIEW' && !remote.webContents.fromId(element.getWebContentsId()).isFocused(); |
13 | } | 14 | } |
14 | 15 | ||
15 | function webviewDidAutofocus(element) { | 16 | function webviewDidAutofocus(element) { |