diff options
author | 2018-03-28 15:35:44 +0200 | |
---|---|---|
committer | 2018-03-28 15:35:44 +0200 | |
commit | b0baacc8636c62c63c8ab8f87672810a4a13dbdc (patch) | |
tree | 4742bde584dcec13d97b0e9da615cb7e76940a82 /src | |
parent | feature(App): Add option to disable GPU acceleration (diff) | |
parent | fix linting issue (diff) | |
download | ferdium-app-b0baacc8636c62c63c8ab8f87672810a4a13dbdc.tar.gz ferdium-app-b0baacc8636c62c63c8ab8f87672810a4a13dbdc.tar.zst ferdium-app-b0baacc8636c62c63c8ab8f87672810a4a13dbdc.zip |
Merge branch 'chore/split-local-settings' into feature/disable-gpu-acceleration
Diffstat (limited to 'src')
-rw-r--r-- | src/electron/ipc-api/settings.js | 4 | ||||
-rw-r--r-- | src/stores/SettingsStore.js | 6 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/electron/ipc-api/settings.js b/src/electron/ipc-api/settings.js index 00bdc0113..3eab68a91 100644 --- a/src/electron/ipc-api/settings.js +++ b/src/electron/ipc-api/settings.js | |||
@@ -1,10 +1,6 @@ | |||
1 | import { ipcMain } from 'electron'; | 1 | import { ipcMain } from 'electron'; |
2 | 2 | ||
3 | export default (params) => { | 3 | export default (params) => { |
4 | ipcMain.on('settings', (event, args) => { | ||
5 | params.settings.set(args); | ||
6 | }); | ||
7 | |||
8 | ipcMain.on('getAppSettings', () => { | 4 | ipcMain.on('getAppSettings', () => { |
9 | params.mainWindow.webContents.send('appSettings', params.settings.all); | 5 | params.mainWindow.webContents.send('appSettings', params.settings.all); |
10 | }); | 6 | }); |
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js index 075cb6482..82fc2a279 100644 --- a/src/stores/SettingsStore.js +++ b/src/stores/SettingsStore.js | |||
@@ -1,4 +1,3 @@ | |||
1 | import { ipcRenderer } from 'electron'; | ||
2 | import { action, computed, observable } from 'mobx'; | 1 | import { action, computed, observable } from 'mobx'; |
3 | import localStorage from 'mobx-localstorage'; | 2 | import localStorage from 'mobx-localstorage'; |
4 | 3 | ||
@@ -65,11 +64,6 @@ export default class SettingsStore extends Store { | |||
65 | } | 64 | } |
66 | } | 65 | } |
67 | 66 | ||
68 | // Reactions | ||
69 | _shareSettingsWithMainProcess() { | ||
70 | ipcRenderer.send('settings', this.all); | ||
71 | } | ||
72 | |||
73 | // Helper | 67 | // Helper |
74 | _migrate() { | 68 | _migrate() { |
75 | const legacySettings = localStorage.getItem('app'); | 69 | const legacySettings = localStorage.getItem('app'); |