summaryrefslogtreecommitdiff
path: root/ext/bg/js/options-form.js
diff options
context:
space:
mode:
authorAlex Yatskov <alex@foosoft.net>2016-05-28 13:35:46 -0700
committerAlex Yatskov <alex@foosoft.net>2016-05-28 13:35:46 -0700
commit4103b09893ed27a951a5521fd469fa58f4661df6 (patch)
tree17b75fe257c56690338fc5bcdd2e06a5aa58b3d8 /ext/bg/js/options-form.js
parente7b6b171cba575f09498603698a98bd665031978 (diff)
Improvements to options page
Diffstat (limited to 'ext/bg/js/options-form.js')
-rw-r--r--ext/bg/js/options-form.js84
1 files changed, 55 insertions, 29 deletions
diff --git a/ext/bg/js/options-form.js b/ext/bg/js/options-form.js
index d5d2eaee..0a39d3ea 100644
--- a/ext/bg/js/options-form.js
+++ b/ext/bg/js/options-form.js
@@ -33,27 +33,28 @@ function optionsToForm(opts) {
$('#anki-kanji-model').val(opts.ankiKanjiModel);
}
-function formToOptions() {
- return sanitizeOptions({
- scanLength: $('#scan-length').val(),
- activateOnStartup: $('#activate-on-startup').prop('checked'),
- loadEnamDict: $('#load-enamdict').prop('checked'),
- selectMatchedText: $('#select-matched-text').prop('checked'),
- enableAnkiConnect: $('#enable-anki-connect').prop('checked'),
- ankiVocabDeck: $('#anki-vocab-deck').val(),
- ankiVocabModel: $('#anki-vocab-model').val(),
- ankiKanjiDeck: $('#anki-kanji-deck').val(),
- ankiKanjiModel: $('#anki-kanji-model').val()
- });
-}
+function formToOptions(section, callback) {
+ loadOptions((optsOld) => {
+ const optsNew = $.extend({}, optsOld);
+
+ switch (section) {
+ case 'general':
+ optsNew.scanLength = $('#scan-length').val();
+ optsNew.activateOnStartup = $('#activate-on-startup').prop('checked');
+ optsNew.loadEnamDict = $('#load-enamdict').prop('checked');
+ optsNew.selectMatchedText = $('#select-matched-text').prop('checked');
+ optsNew.enableAnkiConnect = $('#enable-anki-connect').prop('checked');
+ break;
+ case 'anki':
+ optsNew.ankiVocabDeck = $('#anki-vocab-deck').val();
+ optsNew.ankiVocabModel = $('#anki-vocab-model').val();
+ optsNew.ankiKanjiDeck = $('#anki-kanji-deck').val();
+ optsNew.ankiKanjiModel = $('#anki-kanji-model').val();
+ break;
+ }
-function updateAnkiFormVis(opts) {
- if (opts.enableAnkiConnect) {
- populateAnkiDeckAndModel();
- $('.options-anki').fadeIn();
- } else {
- $('.options-anki').fadeOut();
- }
+ callback(sanitizeOptions(optsNew), sanitizeOptions(optsOld));
+ });
}
function populateAnkiDeckAndModel() {
@@ -72,20 +73,34 @@ function populateAnkiDeckAndModel() {
yomi.api_getModelNames({callback: (names) => {
if (names !== null) {
names.forEach((name) => ankiModel.append($('<option/>', {value: name, text: name})));
- $('.anki-model').trigger('change');
+ ankiModel.trigger('change');
}
}});
-
}
-function onOptionsChanged() {
- const opts = formToOptions();
- saveOptions(opts, () => {
- yomichan().setOptions(opts);
- updateAnkiFormVis(opts);
+function onOptionsGeneralChanged(e) {
+ if (!e.originalEvent) {
+ return;
+ }
+
+ formToOptions('general', (optsNew, optsOld) => {
+ saveOptions(optsNew, () => {
+ yomichan().setOptions(optsNew);
+ if (!optsOld.enableAnkiConnect && optsNew.enableAnkiConnect) {
+ populateAnkiDeckAndModel();
+ }
+ });
});
}
+function onOptionsAnkiChanged(e) {
+ if (e.originalEvent) {
+ formToOptions('anki', (opts) => {
+ saveOptions(opts, () => yomichan().setOptions(opts));
+ });
+ }
+}
+
function onModelChanged() {
const modelName = $(this).val();
if (modelName === null) {
@@ -112,9 +127,20 @@ $(document).ready(() => {
loadOptions((opts) => {
optionsToForm(opts);
- $('input, select').on('input paste change', onOptionsChanged);
+ $('.options-general input').change(onOptionsGeneralChanged);
+ $('.options-anki input, .options-anki select').change(onOptionsAnkiChanged);
$('.anki-model').change(onModelChanged);
+ $('#enable-anki-connect').change(() => {
+ if ($('#enable-anki-connect').prop('checked')) {
+ $('.options-anki').fadeIn();
+ } else {
+ $('.options-anki').fadeOut();
+ }
+ });
- updateAnkiFormVis(opts);
+ if (opts.enableAnkiConnect) {
+ populateAnkiDeckAndModel();
+ $('.options-anki').show();
+ }
});
});