summaryrefslogtreecommitdiff
path: root/ext/bg/js/options.js
diff options
context:
space:
mode:
authorAlex Yatskov <alex@foosoft.net>2017-04-02 12:12:21 -0700
committerAlex Yatskov <alex@foosoft.net>2017-04-02 12:12:21 -0700
commitbea50cca462be631dadbd2f5bde1bc0a12ad17bf (patch)
tree73612a4fedc4d1fe9874979c27187b4176a84569 /ext/bg/js/options.js
parent85001208db67027c430b3a4c8d569fb3930aeb27 (diff)
parentccb740da58068633a0ef5bd1c26bd4dd10625dce (diff)
Merge branch 'master' into firefox-amo
Diffstat (limited to 'ext/bg/js/options.js')
-rw-r--r--ext/bg/js/options.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index 75f39d24..ad8d83d8 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -25,7 +25,7 @@ function formRead() {
return optionsLoad().then(optionsOld => {
const optionsNew = $.extend(true, {}, optionsOld);
- optionsNew.general.audioPlayback = $('#audio-playback-buttons').prop('checked');
+ optionsNew.general.audioSource = $('#audio-playback-source').val();
optionsNew.general.audioVolume = $('#audio-playback-volume').val();
optionsNew.general.groupResults = $('#group-terms-results').prop('checked');
optionsNew.general.softKatakana = $('#soft-katakana-search').prop('checked');
@@ -111,7 +111,7 @@ $(document).ready(() => {
handlebarsRegister();
optionsLoad().then(options => {
- $('#audio-playback-buttons').prop('checked', options.general.audioPlayback);
+ $('#audio-playback-source').val(options.general.audioSource);
$('#audio-playback-volume').val(options.general.audioVolume);
$('#group-terms-results').prop('checked', options.general.groupResults);
$('#soft-katakana-search').prop('checked', options.general.softKatakana);