public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 01:36:22 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2430 from jacobherrington/hotkey-error-message-fix

Browse Source 
Fix errors when saving a blank hotkey
This commit is contained in:
Junyoung Choi (Sai)
2018-11-06 15:48:33 +09:00
committed by GitHub
parent efa00728d6 d0171a8933
commit 27e5010d8e
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
browser/main/modals/PreferencesModal/HotkeyTab.js
View File

@@ -28,10 +28,20 @@ class HotkeyTab extends React.Component {
}}) }})
} }
this.handleSettingError = (err) => { this.handleSettingError = (err) => {
this.setState({keymapAlert: { if (
type: 'error', this.state.config.hotkey.toggleMain === '' ||
message: err.message != null ? err.message : i18n.__('An error occurred!') this.state.config.hotkey.toggleMode === ''
}}) ) {
this.setState({keymapAlert: {
type: 'success',
message: i18n.__('Successfully applied!')
}})
} else {
this.setState({keymapAlert: {
type: 'error',
message: err.message != null ? err.message : i18n.__('An error occurred!')
}})
}
} }
this.oldHotkey = this.state.config.hotkey this.oldHotkey = this.state.config.hotkey
ipc.addListener('APP_SETTING_DONE', this.handleSettingDone) ipc.addListener('APP_SETTING_DONE', this.handleSettingDone)