diff options
| -rw-r--r-- | ext/bg/js/options.js | 24 | ||||
| -rw-r--r-- | ext/bg/js/templates.js | 8 | ||||
| -rw-r--r-- | ext/manifest.json | 2 | ||||
| -rw-r--r-- | tmpl/terms.html | 8 |
4 files changed, 14 insertions, 28 deletions
diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js index 9f1414ad..925c8432 100644 --- a/ext/bg/js/options.js +++ b/ext/bg/js/options.js @@ -19,15 +19,6 @@ function optionsFieldTemplates() { return ` -<style> -.expression-popular { - color: #0275d8; -} - -.expression-rare { - color: #999; -} -</style> {{#*inline "glossary-single"}} {{~#unless brief~}} {{~#if definitionTags~}}<i>({{#each definitionTags}}{{name}}{{#unless @last}}, {{/unless}}{{/each}})</i> {{/if~}} @@ -277,17 +268,16 @@ function optionsVersion(options) { } else { options.general.resultOutputMode = 'split'; } - if (utilStringHashCode(options.anki.fieldTemplates) !== -805327496) { // a3c8508031a1073629803d0616a2ee416cd3cccc - options.anki.fieldTemplates = ` -{{#if merge}} -${optionsFieldTemplates()} -{{else}} -${options.anki.fieldTemplates} -{{/if}} -`.trim(); + if (utilStringHashCode(options.anki.fieldTemplates) !== -805327496) { + options.anki.fieldTemplates = `{{#if merge}}${optionsFieldTemplates()}{{else}}${options.anki.fieldTemplates}{{/if}}`; } else { options.anki.fieldTemplates = optionsFieldTemplates(); } + }, + () => { + if (utilStringHashCode(options.anki.fieldTemplates) === 1285806040) { + options.anki.fieldTemplates = optionsFieldTemplates(); + } } ]; 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/ext/manifest.json b/ext/manifest.json index e415ece9..d75238b1 100644 --- a/ext/manifest.json +++ b/ext/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Yomichan", - "version": "1.5.0", + "version": "1.5.1", "description": "Japanese dictionary with Anki integration", "icons": {"16": "mixed/img/icon16.png", "48": "mixed/img/icon48.png", "128": "mixed/img/icon128.png"}, 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> |