alex/yomichan
1
Fork 0
Code Releases Activity

cleanup

Browse Source
This commit is contained in:
Alex Yatskov 2017-10-28 08:11:33 -07:00
parent 25ae2e475a
commit 0b602925ab
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ext/bg/settings.html
View File

@ -55,7 +55,7 @@
<label for="result-output-mode">Result grouping</label> <label for="result-output-mode">Result grouping</label>
<select class="form-control" id="result-output-mode"> <select class="form-control" id="result-output-mode">
<option value="group">Group results by term-reading pairs</option> <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> <option value="split">Split definitions to their own results</option>
</select> </select>
</div> </div>
@ -140,11 +140,6 @@
<h3>Dictionaries</h3> <h3>Dictionaries</h3>
</div> </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"> <p class="help-block">
Yomichan can import and use a variety of dictionary formats. Unneeded dictionaries can be disabled, 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. 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 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"> <div id="dict-import-progress">
Dictionary data is being imported, please be patient... Dictionary data is being imported, please be patient...
<div class="progress"> <div class="progress">

6
ext/mixed/js/display.js
View File

@ -185,7 +185,8 @@ class Display {
80: /* p */ () => { 80: /* p */ () => {
if (e.altKey) { if (e.altKey) {
if ($('.entry').eq(this.index).data('type') === 'term') { 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; return true;
@ -387,7 +388,8 @@ class Display {
try { try {
this.spinner.show(); 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) { if (!url) {
url = '/mixed/mp3/button.mp3'; url = '/mixed/mp3/button.mp3';
} }

12
tmpl/terms.html
View File

@ -44,9 +44,9 @@
{{#if merged}} {{#if merged}}
{{~#each expressions~}} {{~#each expressions~}}
<div class="expression"><!-- <div class="expression">
--><span class="expression-{{termFrequency}}">{{#kanjiLinks}}{{#furigana}}{{{.}}}{{/furigana}}{{/kanjiLinks}}</span><!-- <span class="expression-{{termFrequency}}">{{#kanjiLinks}}{{#furigana}}{{{.}}}{{/furigana}}{{/kanjiLinks}}</span>
--><div class="peek-wrapper"> <div class="peek-wrapper">
{{~#if ../playback~}} {{~#if ../playback~}}
<a href="#" class="action-play-audio"><img src="/mixed/img/play-audio.png" title="Play audio" alt></a> <a href="#" class="action-play-audio"><img src="/mixed/img/play-audio.png" title="Play audio" alt></a>
{{~/if~}} {{~/if~}}
@ -64,9 +64,9 @@
{{/each~}} {{/each~}}
</div> </div>
{{~/if~}} {{~/if~}}
</div><!-- </div>
--><span class="{{#if @last}}invisible{{/if}}">、</span><!-- <span class="{{#if @last}}invisible{{/if}}">、</span>
--></div> </div>
{{~/each~}} {{~/each~}}
{{else}} {{else}}
<div class="expression">{{#kanjiLinks}}{{#furigana}}{{{.}}}{{/furigana}}{{/kanjiLinks}}</div> <div class="expression">{{#kanjiLinks}}{{#furigana}}{{{.}}}{{/furigana}}{{/kanjiLinks}}</div>