merged mode: missing changes from previous commit

The compiled template is already there, though
This commit is contained in:
siikamiika 2017-10-01 22:51:01 +03:00
parent 803ccc1661
commit 3b664dd908

View File

@ -31,7 +31,12 @@
<img src="/mixed/img/entry-current.png" class="current" title="Current entry (Alt + Up/Down/Home/End/PgUp/PgDn)" alt> <img src="/mixed/img/entry-current.png" class="current" title="Current entry (Alt + Up/Down/Home/End/PgUp/PgDn)" alt>
</div> </div>
{{#if merged}}
<div class="expression">{{#kanjiLinks}}{{#expressions}}{{{.}}}{{/expressions}}{{/kanjiLinks}}</div>
<div>{{#readings}}{{{.}}}{{/readings}}</div>
{{else}}
<div class="expression">{{#kanjiLinks}}{{#furigana}}{{{.}}}{{/furigana}}{{/kanjiLinks}}</div> <div class="expression">{{#kanjiLinks}}{{#furigana}}{{{.}}}{{/furigana}}{{/kanjiLinks}}</div>
{{/if}}
{{#if reasons}} {{#if reasons}}
<div class="reasons"> <div class="reasons">
@ -60,6 +65,16 @@
{{else}} {{else}}
{{> definition definitions.[0]}} {{> definition definitions.[0]}}
{{/if}} {{/if}}
{{else if merged}}
{{#if definitions.[1]}}
<ol>
{{#each definitions}}
<li>{{> definition}}</li>
{{/each}}
</ol>
{{else}}
{{> definition definitions.[0]}}
{{/if}}
{{else}} {{else}}
{{> definition}} {{> definition}}
{{/if}} {{/if}}
@ -74,7 +89,7 @@
{{#if definitions}} {{#if definitions}}
{{#each definitions}} {{#each definitions}}
{{#unless @first}}<hr>{{/unless}} {{#unless @first}}<hr>{{/unless}}
{{> term debug=../debug grouped=../grouped addable=../addable playback=../playback}} {{> term debug=../debug grouped=../grouped merged=../merged addable=../addable playback=../playback}}
{{/each}} {{/each}}
{{else}} {{else}}
<p class="note">No results found.</p> <p class="note">No results found.</p>