aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Yatskov <alex@foosoft.net>2017-03-04 20:10:49 -0800
committerAlex Yatskov <alex@foosoft.net>2017-03-04 20:10:49 -0800
commit5daf2accf4d6628131cd8e054ca6258a669eb715 (patch)
tree86c7eb89e3fe44ddf707cba6337b8ad106375468
parente799aa5e5f7dd526214b8e55de86f525cefec3ee (diff)
wip
-rw-r--r--ext/bg/js/options.js2
-rw-r--r--ext/bg/options.html3
-rw-r--r--ext/mixed/js/display.js5
3 files changed, 5 insertions, 5 deletions
diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index eb8e32d8..5f564b33 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -187,7 +187,7 @@ function onDictionaryPurge(e) {
return optionsLoad();
}).then(options => {
options.dictionaries = {};
- return optionsSave(options).then(populateDictionaries);
+ return optionsSave(options).then(() => populateDictionaries(options));
});
}
diff --git a/ext/bg/options.html b/ext/bg/options.html
index 7d95860b..2a6928cf 100644
--- a/ext/bg/options.html
+++ b/ext/bg/options.html
@@ -127,7 +127,7 @@
<div>
<div>
- <img src="img/spinner.gif" class="pull-right" id="anki-spinner" alt>
+ <img src="/mixed/img/spinner.gif" class="pull-right" id="anki-spinner" alt>
<h3>Anki Options</h3>
</div>
@@ -237,7 +237,6 @@
<script src="/mixed/lib/bootstrap-3.3.7-dist/js/bootstrap.min.js"></script>
<script src="/mixed/lib/handlebars.min.js"></script>
<script src="/bg/js/templates.js"></script>
- <script src="/bg/js/gecko.js"></script>
<script src="/bg/js/util.js"></script>
<script src="/bg/js/options.js"></script>
</body>
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index f9467573..1de65f22 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -50,6 +50,7 @@ class Display {
const sequence = ++this.sequence;
const params = {
definitions,
+ addable: options.anki.enable,
grouped: options.general.groupResults,
playback: options.general.audioPlayback
};
@@ -84,7 +85,7 @@ class Display {
const sequence = ++this.sequence;
const params = {
definitions,
- addable: options.anki.enabled
+ addable: options.anki.enable
};
if (context) {
@@ -137,7 +138,7 @@ class Display {
onActionAddNote(e) {
e.preventDefault();
- this.showSpinner(true);
+ this.spinner.show();
const link = $(e.currentTarget);
const index = link.data('index');