Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2024-09-21 15:56:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(keymaps): Handle empty keymap.json, recover when saving

Browse source
This commit is contained in:
Ben Gotow 2016-05-15 12:19:03 -05:00
parent f865b48f4e
commit e23d597493
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
internal_packages/preferences/lib/tabs/keymaps/command-item.jsx
View file

@ -83,11 +83,20 @@ export default class CommandKeybinding extends React.Component {
_onFinishedEditing = () => { _onFinishedEditing = () => {
if (this.state.editingBinding) { if (this.state.editingBinding) {
const keymapPath = NylasEnv.keymaps.getUserKeymapPath(); const keymapPath = NylasEnv.keymaps.getUserKeymapPath();
let keymaps = {};
try { try {
const exists = fs.existsSync(keymapPath); const exists = fs.existsSync(keymapPath);
const keymaps = exists ? JSON.parse(fs.readFileSync(keymapPath)) : {}; if (exists) {
keymaps[this.props.command] = this.state.editingBinding; keymaps = JSON.parse(fs.readFileSync(keymapPath));
}
} catch (err) {
console.error(err);
}
keymaps[this.props.command] = this.state.editingBinding;
try {
fs.writeFileSync(keymapPath, JSON.stringify(keymaps, null, 2)); fs.writeFileSync(keymapPath, JSON.stringify(keymaps, null, 2));
} catch (err) { } catch (err) {
NylasEnv.showErrorDialog(`Nylas was unable to modify your keymaps at ${keymapPath}. ${err.toString()}`); NylasEnv.showErrorDialog(`Nylas was unable to modify your keymaps at ${keymapPath}. ${err.toString()}`);

3
src/keymap-manager.es6
View file

@ -41,7 +41,8 @@ class KeymapFile {
if (e.code === 'ENOENT') { if (e.code === 'ENOENT') {
return; return;
} }
throw e; console.error(e);
return;
} }
this._bindings = {}; this._bindings = {};