diff options
author | Alex Yatskov <alex@foosoft.net> | 2017-04-01 12:09:40 -0700 |
---|---|---|
committer | Alex Yatskov <alex@foosoft.net> | 2017-04-01 12:09:40 -0700 |
commit | 681470db67fc4fa706e2d29ee5beb54859fe5567 (patch) | |
tree | 9e818516591765b38fbcb304479886b8b6c6f04d /ext/bg/js/util.js | |
parent | f7e47d1dbd1f9a7d42af2cecc4de8d078b062a89 (diff) | |
parent | 4eb3e2f06cd83ef0721557f8559fc0a6d70ad4f5 (diff) |
Merge branch 'master' into firefox-amo
Diffstat (limited to 'ext/bg/js/util.js')
-rw-r--r-- | ext/bg/js/util.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js index d1099262..78258c97 100644 --- a/ext/bg/js/util.js +++ b/ext/bg/js/util.js @@ -85,6 +85,7 @@ function optionsSetDefaults(options) { general: { enable: true, audioPlayback: true, + audioVolume: 100, groupResults: true, softKatakana: true, maxResults: 32, @@ -375,7 +376,7 @@ function dictTermsGroup(definitions, dictionaries) { expression: firstDef.expression, reading: firstDef.reading, reasons: firstDef.reasons, - score: groupDefs.reduce((x, y) => x.score > y.score ? x.score : y.score, Number.MIN_SAFE_INTEGER), + score: groupDefs.reduce((p, v) => v.score > p ? v.score : p, Number.MIN_SAFE_INTEGER), source: firstDef.source }); } |