From c076821e3709333bf19934d547c372d669f8ad84 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Sun, 16 Oct 2016 18:44:36 -0700 Subject: [PATCH] WIP --- ext/bg/js/options-form.js | 18 +++++++----------- ext/bg/options.html | 21 ++++++--------------- 2 files changed, 13 insertions(+), 26 deletions(-) diff --git a/ext/bg/js/options-form.js b/ext/bg/js/options-form.js index f66a678c..6731c007 100644 --- a/ext/bg/js/options-form.js +++ b/ext/bg/js/options-form.js @@ -120,9 +120,7 @@ function updateVisibility(opts) { } function populateAnkiDeckAndModel(opts) { - $('.status-dlg').hide(); - - const ankiSpinner = $('#ankiSpinner'); + const ankiSpinner = $('#anki-spinner'); ankiSpinner.show(); const ankiFormat = $('#anki-format'); @@ -146,12 +144,10 @@ function populateAnkiDeckAndModel(opts) { }).then(() => { return populateAnkiFields($('#anki-kanji-model').val(opts.ankiKanjiModel), opts); }).then(() => { + $('#anki-error').hide(); ankiFormat.show(); - if (opts.ankiMethod !== 'none') { - $('#success-dlg').show(); - } }).catch(error => { - $('#error-dlg').show().find('span').text(error); + $('#anki-error').show().find('span').text(error); }).then(() => { ankiSpinner.hide(); }); @@ -218,6 +214,7 @@ function onOptionsChanged(e) { saveOptions(optsNew).then(() => { yomichan().setOptions(optsNew); updateVisibility(optsNew); + if (optsNew.ankiMethod !== optsOld.ankiMethod) { populateAnkiDeckAndModel(optsNew); } @@ -233,16 +230,15 @@ function onAnkiModelChanged(e) { getFormValues().then(({optsNew, optsOld}) => { optsNew[modelIdToFieldOptKey($(this).id)] = {}; - const ankiSpinner = $('#ankiSpinner'); + const ankiSpinner = $('#anki-spinner'); ankiSpinner.show(); populateAnkiFields($(this), optsNew).then(() => { saveOptions(optsNew).then(() => yomichan().setOptions(optsNew)); }).catch(error => { - $('#success-dlg').hide(); - $('#error-dlg').show().find('span').text(error); + $('#anki-error').show().find('span').text(error); }).then(() => { - $('#success-dlg').show(); + $('#anki-error').hide(); ankiSpinner.hide(); }); }); diff --git a/ext/bg/options.html b/ext/bg/options.html index 4d67716e..b79332af 100644 --- a/ext/bg/options.html +++ b/ext/bg/options.html @@ -6,7 +6,7 @@ @@ -91,6 +87,11 @@

Anki Options

+
+ Error + +
+
-
- Error - Unable to connect -
- -
- Success - Connection established -
-