diff options
| author | Alex Yatskov <FooSoft@users.noreply.github.com> | 2017-11-06 09:16:01 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-06 09:16:01 -0800 |
| commit | e1d1c109a033ab269d17b6d2b1487ba865233d3f (patch) | |
| tree | 29be56e9e80b53e8877e899388a322764619fb2c | |
| parent | dcef7ce3774a3dcc8e7bee0bc17398251523451e (diff) | |
| parent | 0c3e10a822fb4de19b5e45a96e90dbd3082c4f7a (diff) | |
Merge pull request #96 from siikamiika/dev
merged mode: remove whitespace between expressions
| -rw-r--r-- | ext/bg/js/templates.js | 8 | ||||
| -rw-r--r-- | tmpl/terms.html | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js index 680ec742..43acd28d 100644 --- a/ext/bg/js/templates.js +++ b/ext/bg/js/templates.js @@ -314,19 +314,19 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.expressions : depth0),{"name":"each","hash":{},"fn":container.program(29, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : ""); },"29":function(container,depth0,helpers,partials,data,blockParams,depths) { var stack1, helper, options, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", buffer = - "<div class=\"expression\">\n <span class=\"expression-" + "<div class=\"expression\"><span class=\"expression-" + container.escapeExpression(((helper = (helper = helpers.termFrequency || (depth0 != null ? depth0.termFrequency : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"termFrequency","hash":{},"data":data}) : helper))) + "\">"; stack1 = ((helper = (helper = helpers.kanjiLinks || (depth0 != null ? depth0.kanjiLinks : depth0)) != null ? helper : alias2),(options={"name":"kanjiLinks","hash":{},"fn":container.program(30, data, 0, blockParams, depths),"inverse":container.noop,"data":data}),(typeof helper === alias3 ? helper.call(alias1,options) : helper)); if (!helpers.kanjiLinks) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)} if (stack1 != null) { buffer += stack1; } - return buffer + "</span>\n <div class=\"peek-wrapper\">" + return buffer + "</span><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.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 : "") - + "</div>\n <span class=\"" + + "</div><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 : "") - + "\">、</span>\n </div>"; + + "\">、</span></div>"; },"30":function(container,depth0,helpers,partials,data) { var stack1, helper, options; diff --git a/tmpl/terms.html b/tmpl/terms.html index 35dedb71..e01fc8d5 100644 --- a/tmpl/terms.html +++ b/tmpl/terms.html @@ -44,9 +44,7 @@ {{#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 +62,7 @@ {{/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> |