diff options
| -rw-r--r-- | ext/bg/settings.html | 12 | ||||
| -rw-r--r-- | ext/mixed/js/display.js | 6 | ||||
| -rw-r--r-- | tmpl/terms.html | 12 |
3 files changed, 16 insertions, 14 deletions
diff --git a/ext/bg/settings.html b/ext/bg/settings.html index f430d5e2..12556065 100644 --- a/ext/bg/settings.html +++ b/ext/bg/settings.html @@ -55,7 +55,7 @@ <label for="result-output-mode">Result grouping</label> <select class="form-control" id="result-output-mode"> <option value="group">Group results by term-reading pairs</option> - <option value="merge">Group results by main dictionary entry ID (experimental)</option> + <option value="merge">Group results by main dictionary entry</option> <option value="split">Split definitions to their own results</option> </select> </div> @@ -140,11 +140,6 @@ <h3>Dictionaries</h3> </div> - <div class="form-group options-merge"> - <label for="main-dictionary">Main dictionary</label> - <select class="form-control" id="main-dictionary"></select> - </div> - <p class="help-block"> Yomichan can import and use a variety of dictionary formats. Unneeded dictionaries can be disabled, or you can simply <a href="#" id="dict-purge-link">purge the database</a> to delete everything. @@ -160,6 +155,11 @@ <div id="dict-groups"></div> + <div class="form-group options-merge"> + <label for="main-dictionary">Main dictionary</label> + <select class="form-control" id="main-dictionary"></select> + </div> + <div id="dict-import-progress"> Dictionary data is being imported, please be patient... <div class="progress"> diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js index 41fe85eb..5d3c4f2e 100644 --- a/ext/mixed/js/display.js +++ b/ext/mixed/js/display.js @@ -185,7 +185,8 @@ class Display { 80: /* p */ () => { if (e.altKey) { if ($('.entry').eq(this.index).data('type') === 'term') { - this.audioPlay(this.definitions[this.index], this.options.general.resultOutputMode === 'merge' ? 0 : -1); + const expressionIndex = this.options.general.resultOutputMode === 'merge' ? 0 : -1; + this.audioPlay(this.definitions[this.index], expressionIndex); } return true; @@ -387,7 +388,8 @@ class Display { try { this.spinner.show(); - let url = await apiAudioGetUrl(expressionIndex === -1 ? definition : definition.expressions[expressionIndex], this.options.general.audioSource); + const expression = expressionIndex === -1 ? definition : definition.expressions[expressionIndex]; + let url = await apiAudioGetUrl(expression, this.options.general.audioSource); if (!url) { url = '/mixed/mp3/button.mp3'; } diff --git a/tmpl/terms.html b/tmpl/terms.html index 245a0ea1..35dedb71 100644 --- a/tmpl/terms.html +++ b/tmpl/terms.html @@ -44,9 +44,9 @@ {{#if merged}} {{~#each expressions~}} - <div class="expression"><!-- - --><span class="expression-{{termFrequency}}">{{#kanjiLinks}}{{#furigana}}{{{.}}}{{/furigana}}{{/kanjiLinks}}</span><!-- - --><div class="peek-wrapper"> + <div class="expression"> + <span class="expression-{{termFrequency}}">{{#kanjiLinks}}{{#furigana}}{{{.}}}{{/furigana}}{{/kanjiLinks}}</span> + <div class="peek-wrapper"> {{~#if ../playback~}} <a href="#" class="action-play-audio"><img src="/mixed/img/play-audio.png" title="Play audio" alt></a> {{~/if~}} @@ -64,9 +64,9 @@ {{/each~}} </div> {{~/if~}} - </div><!-- - --><span class="{{#if @last}}invisible{{/if}}">、</span><!-- - --></div> + </div> + <span class="{{#if @last}}invisible{{/if}}">、</span> + </div> {{~/each~}} {{else}} <div class="expression">{{#kanjiLinks}}{{#furigana}}{{{.}}}{{/furigana}}{{/kanjiLinks}}</div> |