summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsiikamiika <siikamiika@users.noreply.github.com>2017-10-17 09:27:47 +0300
committersiikamiika <siikamiika@users.noreply.github.com>2017-10-17 09:27:47 +0300
commit1edeabdaa8861e149cd7f76f58d97aa127117f79 (patch)
tree24a07b39783e1f12d7b95c7c7a9fbf5a52d95a64
parentb104dfd524c517a1f910503a8bad564121044e27 (diff)
merged mode: tags -> termTags (inside expressions)
-rw-r--r--ext/bg/js/templates.js4
-rw-r--r--ext/bg/js/translator.js2
-rw-r--r--tmpl/terms.html4
3 files changed, 5 insertions, 5 deletions
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index 5b5e63f5..d2aa1ee0 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -320,7 +320,7 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
if (stack1 != null) { buffer += stack1; }
return buffer + "</span><!--\n --><div class=\"peek-wrapper\">"
+ ((stack1 = helpers["if"].call(alias1,(depths[1] != null ? depths[1].playback : depths[1]),{"name":"if","hash":{},"fn":container.program(33, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
- + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.tags : depth0),{"name":"if","hash":{},"fn":container.program(35, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.termTags : depth0),{"name":"if","hash":{},"fn":container.program(35, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.frequencies : depth0),{"name":"if","hash":{},"fn":container.program(38, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ "<!--\n --></div><!--\n --><span class=\""
+ ((stack1 = helpers["if"].call(alias1,(data && data.last),{"name":"if","hash":{},"fn":container.program(41, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
@@ -342,7 +342,7 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
var stack1;
return "<div class=\"tags\">"
- + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(36, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.termTags : depth0),{"name":"each","hash":{},"fn":container.program(36, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ " </div>\n";
},"36":function(container,depth0,helpers,partials,data) {
var helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index 29bb857b..bf347343 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -112,7 +112,7 @@ class Translator {
expressions.push({
expression: expression,
reading: reading,
- tags: dictTagsSort(tags),
+ termTags: dictTagsSort(tags),
jmdictTermFrequency: (tags => {
if (tags.has('P')) {
return 'popular';
diff --git a/tmpl/terms.html b/tmpl/terms.html
index 7a464cba..c83a4b15 100644
--- a/tmpl/terms.html
+++ b/tmpl/terms.html
@@ -50,9 +50,9 @@
{{~#if ../playback~}}
<a href="#" class="action-play-audio"><img src="/mixed/img/play-audio.png" title="Play audio" alt></a>
{{/if}}
- {{~#if tags~}}
+ {{~#if termTags~}}
<div class="tags">
- {{~#each tags~}}
+ {{~#each termTags~}}
<span class="label label-default tag-{{category}}" title="{{notes}}">{{name}}</span>
{{/each}}
</div>