From 03fd9dcdb451ad55b9b2d2b5bd489e6ca3ba648a Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Thu, 5 Oct 2017 01:06:11 +0300
Subject: merged mode: remove extra whitespace between terms

---
 ext/bg/js/templates.js | 2 +-
 tmpl/terms.html        | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index b9303ee4..c6de8580 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -296,7 +296,7 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
   stack1 = ((helper = (helper = helpers.kanjiLinks || (depth0 != null ? depth0.kanjiLinks : depth0)) != null ? helper : alias2),(options={"name":"kanjiLinks","hash":{},"fn":container.program(23, data, 0),"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        "
+  return buffer + "</span>"
     + ((stack1 = helpers.unless.call(alias1,(data && data.last),{"name":"unless","hash":{},"fn":container.program(26, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\n    </div>\n";
 },"23":function(container,depth0,helpers,partials,data) {
diff --git a/tmpl/terms.html b/tmpl/terms.html
index 36901b5b..505ae5d4 100644
--- a/tmpl/terms.html
+++ b/tmpl/terms.html
@@ -43,8 +43,7 @@
     {{#if merged}}
     {{#each expressions}}
     <div class="expression">
-        <span class="expression-{{jmdictTermFrequency}}">{{#kanjiLinks}}{{#furigana}}{{{.}}}{{/furigana}}{{/kanjiLinks}}</span>
-        {{#unless @last}}、{{/unless}}
+        <span class="expression-{{jmdictTermFrequency}}">{{#kanjiLinks}}{{#furigana}}{{{.}}}{{/furigana}}{{/kanjiLinks}}</span>{{#unless @last}}、{{/unless}}
     </div>
     {{/each}}
     {{else}}
-- 
cgit v1.2.3