jab2870/Vim-Vixen
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

confirm before setting migration

Browse source
This commit is contained in:
Shin'ya Ueoka 2017-11-26 16:41:59 +09:00
parent 26777d9e30
commit c23333110d
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.eslintrc
View file

@ -36,6 +36,7 @@
"newline-after-var": "off", "newline-after-var": "off",
"newline-before-return": "off", "newline-before-return": "off",
"newline-per-chained-call": "off", "newline-per-chained-call": "off",
"no-alert": "off",
"no-bitwise": "off", "no-bitwise": "off",
"no-console": ["error", { "allow": ["warn", "error"] }], "no-console": ["error", { "allow": ["warn", "error"] }],
"no-empty-function": "off", "no-empty-function": "off",

9
src/settings/components/index.jsx
View file

@ -8,6 +8,10 @@ import * as settingActions from 'settings/actions/setting';
import * as validator from 'shared/validators/setting'; import * as validator from 'shared/validators/setting';
import * as settingsValues from 'shared/settings/values'; import * as settingsValues from 'shared/settings/values';
const DO_YOU_WANT_TO_CONTINUE =
'Some settings in JSON can be lose on migrating. ' +
'Do you want to continue ?';
class SettingsComponent extends Component { class SettingsComponent extends Component {
constructor(props, context) { constructor(props, context) {
super(props, context); super(props, context);
@ -154,6 +158,11 @@ class SettingsComponent extends Component {
next.settings.json = next.settings.json =
settingsValues.jsonFromForm(this.state.settings.form); settingsValues.jsonFromForm(this.state.settings.form);
} else if (from === 'json' && to === 'form') { } else if (from === 'json' && to === 'form') {
let b = window.confirm(DO_YOU_WANT_TO_CONTINUE);
if (!b) {
this.setState(this.state);
return;
}
next.settings.form = next.settings.form =
settingsValues.formFromJson(this.state.settings.json); settingsValues.formFromJson(this.state.settings.json);
} }