summaryrefslogtreecommitdiff
path: root/ext/bg
diff options
context:
space:
mode:
authorAlex Yatskov <alex@foosoft.net>2017-11-08 17:18:27 -0800
committerAlex Yatskov <alex@foosoft.net>2017-11-08 17:18:27 -0800
commit6489d8cee06205ee827df6320a0347df5aaf5842 (patch)
treef084ba36ce6050316a30c466f0f6e53dd6234a5b /ext/bg
parentd505edb94b27ecd8cbaaecd11cbebfbe12b16164 (diff)
parent5f6830c7dd88520ebf41c24ab51e2c3240039939 (diff)
Merge branch 'dev'
Diffstat (limited to 'ext/bg')
-rw-r--r--ext/bg/js/options.js24
-rw-r--r--ext/bg/js/templates.js8
2 files changed, 11 insertions, 21 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;