diff options
Diffstat (limited to 'ext/bg')
| -rw-r--r-- | ext/bg/background.html | 1 | ||||
| -rw-r--r-- | ext/bg/js/options-form.js | 20 | ||||
| -rw-r--r-- | ext/bg/js/options.js | 6 | ||||
| -rw-r--r-- | ext/bg/js/yomichan.js | 3 | ||||
| -rw-r--r-- | ext/bg/options.html | 18 |
5 files changed, 7 insertions, 41 deletions
diff --git a/ext/bg/background.html b/ext/bg/background.html index 49fc6d0f..3ecfa3dc 100644 --- a/ext/bg/background.html +++ b/ext/bg/background.html @@ -4,7 +4,6 @@ <script src="../lib/handlebars.min.js"></script> <script src="../lib/dexie.min.js"></script> <script src="../lib/wanakana.min.js"></script> - <script src="js/ankiweb.js"></script> <script src="js/ankiconnect.js"></script> <script src="js/ankinull.js"></script> <script src="js/templates.js"></script> diff --git a/ext/bg/js/options-form.js b/ext/bg/js/options-form.js index 957f4ce5..8cffb2f7 100644 --- a/ext/bg/js/options-form.js +++ b/ext/bg/js/options-form.js @@ -40,8 +40,6 @@ function getFormValues() { optsNew.scanLength = parseInt($('#scan-length').val(), 10); optsNew.ankiMethod = $('#anki-method').val(); - optsNew.ankiUsername = $('#anki-username').val(); - optsNew.ankiPassword = $('#anki-password').val(); optsNew.ankiCardTags = $('#anki-card-tags').val().split(/[,; ]+/); optsNew.sentenceExtent = parseInt($('#sentence-extent').val(), 10); optsNew.ankiTermDeck = $('#anki-term-deck').val(); @@ -68,13 +66,8 @@ function getFormValues() { function updateVisibility(opts) { switch (opts.ankiMethod) { - case 'ankiweb': - $('#anki-general').show(); - $('.anki-login').show(); - break; case 'ankiconnect': $('#anki-general').show(); - $('.anki-login').hide(); break; default: $('#anki-general').hide(); @@ -104,8 +97,6 @@ $(document).ready(() => { $('#scan-length').val(opts.scanLength); $('#anki-method').val(opts.ankiMethod); - $('#anki-username').val(opts.ankiUsername); - $('#anki-password').val(opts.ankiPassword); $('#anki-card-tags').val(opts.ankiCardTags.join(' ')); $('#sentence-extent').val(opts.sentenceExtent); @@ -433,16 +424,7 @@ function onOptionsChanged(e) { return saveOptions(optsNew).then(() => { yomichan().setOptions(optsNew); updateVisibility(optsNew); - - const loginChanged = - optsNew.ankiUsername !== optsOld.ankiUsername || - optsNew.ankiPassword !== optsOld.ankiPassword; - - if (loginChanged && optsNew.ankiMethod === 'ankiweb') { - showAnkiError(null); - showAnkiSpinner(true); - return anki().logout().then(() => populateAnkiDeckAndModel(optsNew)); - } else if (optsNew.ankiMethod !== optsOld.ankiMethod) { + if (optsNew.ankiMethod !== optsOld.ankiMethod) { showAnkiError(null); showAnkiSpinner(true); return populateAnkiDeckAndModel(optsNew); diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js index 822f5a16..2f0bd189 100644 --- a/ext/bg/js/options.js +++ b/ext/bg/js/options.js @@ -45,8 +45,6 @@ function sanitizeOptions(options) { dictionaries: {}, ankiMethod: 'disabled', - ankiUsername: '', - ankiPassword: '', ankiCardTags: ['yomichan'], sentenceExtent: 200, @@ -64,6 +62,10 @@ function sanitizeOptions(options) { } } + if (options.ankiMethod === 'ankiweb') { + options.ankiMethod = 'disabled'; + } + return options; } diff --git a/ext/bg/js/yomichan.js b/ext/bg/js/yomichan.js index 41b55352..2cdcf1c8 100644 --- a/ext/bg/js/yomichan.js +++ b/ext/bg/js/yomichan.js @@ -95,9 +95,6 @@ class Yomichan { this.options = options; switch (options.ankiMethod) { - case 'ankiweb': - this.anki = new AnkiWeb(options.ankiUsername, options.ankiPassword); - break; case 'ankiconnect': this.anki = new AnkiConnect(); break; diff --git a/ext/bg/options.html b/ext/bg/options.html index bc0302a2..6bf6fb7b 100644 --- a/ext/bg/options.html +++ b/ext/bg/options.html @@ -128,9 +128,8 @@ <p class="help-block"> Yomichan features automatic flashcard creation for <a href="http://ankisrs.net/">Anki</a>, a free application - designed to help you retain knowledge. While the <a href="https://foosoft.net/projects/anki-connect/">AnkiConnect</a> plugin - offers the best experience, it is also possible to create flashcards through <a href="https://ankiweb.net/">AnkiWeb</a>, - provided you already have an account. + designed to help you retain knowledge. This functionality requires prior installation of the + <a href="https://foosoft.net/projects/anki-connect/">AnkiConnect</a> plugin. </p> <div class="alert alert-danger" id="anki-error"> @@ -143,23 +142,10 @@ <select class="form-control" id="anki-method"> <option value="disabled">Disabled (no auto flashcard creation)</option> <option value="ankiconnect">AnkiConnect (requires the AnkiConnect plugin)</option> - <option value="ankiweb">AnkiWeb (requires an account on AnkiWeb)</option> </select> </div> <div id="anki-general"> - <div class="row"> - <div class="form-group anki-login col-xs-6"> - <label for="anki-username">Username</label> - <input type="text" id="anki-username" class="form-control anki-credential"> - </div> - - <div class="form-group anki-login col-xs-6"> - <label for="anki-password">Password</label> - <input type="password" id="anki-password" class="form-control anki-credential"> - </div> - </div> - <div class="form-group"> <label for="anki-card-tags">Card tags (comma or space separated)</label> <input type="text" id="anki-card-tags" class="form-control"> |