From 45a46cbc7a94be654e9e308bfa6d23bafb9216a6 Mon Sep 17 00:00:00 2001 From: Dick Choi Date: Sat, 9 Jan 2016 21:48:21 +0900 Subject: [PATCH] make configurable --disable-direct-write flag --- .../main/modal/Preference/AppSettingTab.js | 13 +++++++++--- browser/styles/main/modal/Preferences.styl | 12 +++++++++++ lib/config.js | 20 ++++++++++++------- lib/main-app.js | 2 +- 4 files changed, 36 insertions(+), 11 deletions(-) diff --git a/browser/main/modal/Preference/AppSettingTab.js b/browser/main/modal/Preference/AppSettingTab.js index 1a29f1ce..0cef001a 100644 --- a/browser/main/modal/Preference/AppSettingTab.js +++ b/browser/main/modal/Preference/AppSettingTab.js @@ -78,6 +78,14 @@ export default class AppSettingTab extends React.Component { } } + handleDisableDirectWriteClick (e) { + let config = this.state.config + config['disable-direct-write'] = !config['disable-direct-write'] + this.setState({ + config + }) + } + handleNameSaveButtonClick (e) { let { dispatch } = this.props @@ -156,9 +164,8 @@ export default class AppSettingTab extends React.Component { { true// !OSX ? ( -
- - this.handleConfigKeyDown(e)} type='checkbox'/> +
+
) : null diff --git a/browser/styles/main/modal/Preferences.styl b/browser/styles/main/modal/Preferences.styl index 8e759f18..9587ba2e 100644 --- a/browser/styles/main/modal/Preferences.styl +++ b/browser/styles/main/modal/Preferences.styl @@ -69,6 +69,18 @@ iptFocusBorderColor = #369DCD font-size 18px margin 10px 0 5px color brandColor + &>.sectionCheck + margin-bottom 5px + height 33px + label + width 150px + padding-left 15px + line-height 33px + .sectionCheck-warn + font-size 12px + margin-left 10px + border-left 2px solid brandColor + padding-left 5px &>.sectionInput margin-bottom 5px clearfix() diff --git a/lib/config.js b/lib/config.js index 6c2632db..d1b8303a 100644 --- a/lib/config.js +++ b/lib/config.js @@ -2,7 +2,6 @@ const electron = require('electron') const app = electron.app const ipc = electron.ipcMain const jetpack = require('fs-jetpack') -const mainWindow = require('./main-window') const defaultConfig = { 'editor-font-size': '14', @@ -41,13 +40,20 @@ function saveConfig () { // Init global.config = Object.assign({}, defaultConfig, getConfig()) -function applyConfig () { - mainWindow.webContents.send('config-apply') +if (global.config['disable-direct-write']) { + app.commandLine.appendSwitch('disable-direct-write') } -ipc.on('configUpdated', function (event, newConfig) { - global.config = Object.assign({}, defaultConfig, global.config, newConfig) - saveConfig() - applyConfig() +app.on('ready', function () { + const mainWindow = require('./main-window') + function applyConfig () { + mainWindow.webContents.send('config-apply') + } + + ipc.on('configUpdated', function (event, newConfig) { + global.config = Object.assign({}, defaultConfig, global.config, newConfig) + saveConfig() + applyConfig() + }) }) diff --git a/lib/main-app.js b/lib/main-app.js index 0d594d72..ca8d4cdc 100644 --- a/lib/main-app.js +++ b/lib/main-app.js @@ -10,6 +10,7 @@ const nodeIpc = require('@rokt33r/node-ipc') const GhReleases = require('electron-gh-releases') // electron.crashReporter.start() +require('./config') var mainWindow = null var finderProcess = null var finderWindow = null @@ -295,7 +296,6 @@ app.on('ready', function () { }) require('./hotkey') - require('./config') }) module.exports = app