public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-14 18:26:26 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2109 from voidsatisfaction/fix-M-key-issue

Browse Source 
Fix MacOs 'M' key issue
This commit is contained in:
Junyoung Choi (Sai)
2018-06-21 02:36:27 +09:00
committed by GitHub
parent c42e1a0ab4 bdd5b7b3a7
commit 4bb7929229
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
browser/main/Detail/MarkdownNoteDetail.js
View File

@@ -277,6 +277,7 @@ class MarkdownNoteDetail extends React.Component {
handleSwitchMode (type) { handleSwitchMode (type) {
this.setState({ editorType: type }, () => { this.setState({ editorType: type }, () => {
this.focus()
const newConfig = Object.assign({}, this.props.config) const newConfig = Object.assign({}, this.props.config)
newConfig.editor.type = type newConfig.editor.type = type
ConfigManager.set(newConfig) ConfigManager.set(newConfig)

4
browser/main/lib/ConfigManager.js
View File

@@ -21,8 +21,8 @@ export const DEFAULT_CONFIG = {
listStyle: 'DEFAULT', // 'DEFAULT', 'SMALL' listStyle: 'DEFAULT', // 'DEFAULT', 'SMALL'
amaEnabled: true, amaEnabled: true,
hotkey: { hotkey: {
toggleMain: OSX ? 'Cmd + Alt + L' : 'Super + Alt + E', toggleMain: OSX ? 'Command + Alt + L' : 'Super + Alt + E',
toggleMode: OSX ? 'Cmd + M' : 'Ctrl + M' toggleMode: OSX ? 'Command + M' : 'Ctrl + M'
}, },
ui: { ui: {
language: 'en', language: 'en',

2
browser/main/lib/shortcutManager.js
View File

@@ -3,7 +3,7 @@ import CM from 'browser/main/lib/ConfigManager'
import ee from 'browser/main/lib/eventEmitter' import ee from 'browser/main/lib/eventEmitter'
import { isObjectEqual } from 'browser/lib/utils' import { isObjectEqual } from 'browser/lib/utils'
require('mousetrap-global-bind') require('mousetrap-global-bind')
const functions = require('./shortcut') import functions from './shortcut'
let shortcuts = CM.get().hotkey let shortcuts = CM.get().hotkey