diff options
| -rw-r--r-- | ext/bg/js/templates.js | 148 | ||||
| -rw-r--r-- | tmpl/fields.html | 74 | 
2 files changed, 129 insertions, 93 deletions
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js index 4ef66de8..75429e24 100644 --- a/ext/bg/js/templates.js +++ b/ext/bg/js/templates.js @@ -32,14 +32,14 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti  },"2":function(container,depth0,helpers,partials,data) {      var stack1, alias1=depth0 != null ? depth0 : {}; -  return ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.tags : stack1),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") -    + ((stack1 = helpers["if"].call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(7, data, 0),"inverse":container.program(11, data, 0),"data":data})) != null ? stack1 : ""); +  return ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.tags : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") +    + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(7, data, 0),"inverse":container.program(11, data, 0),"data":data})) != null ? stack1 : "");  },"3":function(container,depth0,helpers,partials,data) {      var stack1; -  return "            (<div>" -    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.tags : stack1),{"name":"each","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") -    + "</div>)\n"; +  return "<div>(" +    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") +    + ")</div>";  },"4":function(container,depth0,helpers,partials,data) {      var stack1, helper, alias1=depth0 != null ? depth0 : {}; @@ -50,9 +50,9 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti  },"7":function(container,depth0,helpers,partials,data) {      var stack1; -  return "            <ul>" -    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1),{"name":"each","hash":{},"fn":container.program(8, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") -    + "</ul>\n"; +  return "<ul>" +    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(8, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") +    + "</ul>";  },"8":function(container,depth0,helpers,partials,data) {      var stack1, helper, options, buffer =     "<li>>"; @@ -64,32 +64,30 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti      return container.escapeExpression(container.lambda(depth0, depth0));  },"11":function(container,depth0,helpers,partials,data) {      var stack1, helper, options, buffer =  -  "            <div>"; +  "<div>";    stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(12, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));    if (!helpers.multiLine) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}    if (stack1 != null) { buffer += stack1; } -  return buffer + "</div>\n"; +  return buffer + "</div>";  },"12":function(container,depth0,helpers,partials,data) {      var stack1; -  return container.escapeExpression(container.lambda(((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1)) != null ? stack1["0"] : stack1), depth0)); +  return container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["0"] : stack1), depth0));  },"14":function(container,depth0,helpers,partials,data) {      var stack1, alias1=depth0 != null ? depth0 : {}; -  return "        " -    + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.tags : stack1),{"name":"if","hash":{},"fn":container.program(15, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") -    + ((stack1 = helpers["if"].call(alias1,((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(17, data, 0),"inverse":container.program(12, data, 0),"data":data})) != null ? stack1 : "") -    + "\n"; +  return ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.tags : depth0),{"name":"if","hash":{},"fn":container.program(15, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") +    + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(17, data, 0),"inverse":container.program(12, data, 0),"data":data})) != null ? stack1 : "");  },"15":function(container,depth0,helpers,partials,data) {      var stack1;    return "(" -    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.tags : stack1),{"name":"each","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") -    + ") "; +    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") +    + ")";  },"17":function(container,depth0,helpers,partials,data) {      var stack1; -  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1),{"name":"each","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : ""); +  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");  },"18":function(container,depth0,helpers,partials,data) {      var stack1; @@ -130,10 +128,12 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti  },"32":function(container,depth0,helpers,partials,data) {      var stack1; -  return "    " -    + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1),{"name":"if","hash":{},"fn":container.program(33, data, 0),"inverse":container.program(30, data, 0),"data":data})) != null ? stack1 : "") -    + "\n"; +  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(33, data, 0),"inverse":container.program(36, data, 0),"data":data})) != null ? stack1 : "");  },"33":function(container,depth0,helpers,partials,data) { +    var stack1; + +  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1),{"name":"if","hash":{},"fn":container.program(34, data, 0),"inverse":container.program(30, data, 0),"data":data})) != null ? stack1 : ""); +},"34":function(container,depth0,helpers,partials,data) {      var stack1, alias1=container.lambda, alias2=container.escapeExpression;    return "<ruby>" @@ -141,73 +141,101 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti      + "<rt>"      + alias2(alias1(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1), depth0))      + "</rt></ruby>"; -},"35":function(container,depth0,helpers,partials,data) { -    var stack1; - -  return "<div style=\"text-align: left;\">\n" -    + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.group : depth0),{"name":"if","hash":{},"fn":container.program(36, data, 0),"inverse":container.program(42, data, 0),"data":data})) != null ? stack1 : "") -    + "</div>\n";  },"36":function(container,depth0,helpers,partials,data) {      var stack1; -  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definitions : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(37, data, 0),"inverse":container.program(40, data, 0),"data":data})) != null ? stack1 : ""); +  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1),{"name":"if","hash":{},"fn":container.program(37, data, 0),"inverse":container.program(30, data, 0),"data":data})) != null ? stack1 : "");  },"37":function(container,depth0,helpers,partials,data) { -    var stack1; +    var stack1, alias1=container.lambda, alias2=container.escapeExpression; -  return "    <ol>\n" -    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(38, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") -    + "    </ol>\n"; -},"38":function(container,depth0,helpers,partials,data) { -    var stack1; +  return alias2(alias1(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.expression : stack1), depth0)) +    + " [" +    + alias2(alias1(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1), depth0)) +    + "]"; +},"39":function(container,depth0,helpers,partials,data) { +    var stack1, alias1=depth0 != null ? depth0 : {}; -  return "            <li>" -    + ((stack1 = container.invokePartial(partials.definition,depth0,{"name":"definition","data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "") -    + "</li>\n"; +  return ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(40, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") +    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.group : depth0),{"name":"if","hash":{},"fn":container.program(42, data, 0),"inverse":container.program(52, data, 0),"data":data})) != null ? stack1 : "") +    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(54, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");  },"40":function(container,depth0,helpers,partials,data) { +    return "<div style=\"text-align: left;\">"; +},"42":function(container,depth0,helpers,partials,data) {      var stack1; -  return ((stack1 = container.invokePartial(partials.definition,((stack1 = (depth0 != null ? depth0.definitions : depth0)) != null ? stack1["0"] : stack1),{"name":"definition","data":data,"indent":"        ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : ""); -},"42":function(container,depth0,helpers,partials,data) { +  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(43, data, 0),"inverse":container.program(50, data, 0),"data":data})) != null ? stack1 : ""); +},"43":function(container,depth0,helpers,partials,data) {      var stack1; -  return ((stack1 = container.invokePartial(partials.definition,depth0,{"name":"definition","data":data,"indent":"    ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : ""); +  return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(44, data, 0),"inverse":container.program(47, data, 0),"data":data})) != null ? stack1 : "");  },"44":function(container,depth0,helpers,partials,data) {      var stack1; +  return "<ol>" +    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1),{"name":"each","hash":{},"fn":container.program(45, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") +    + "</ol>"; +},"45":function(container,depth0,helpers,partials,data) { +    var stack1; + +  return "<li>" +    + ((stack1 = container.invokePartial(partials["glossary-single"],depth0,{"name":"glossary-single","data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "") +    + "</li>"; +},"47":function(container,depth0,helpers,partials,data) { +    var stack1; + +  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1),{"name":"each","hash":{},"fn":container.program(48, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : ""); +},"48":function(container,depth0,helpers,partials,data) { +    var stack1; + +  return "* " +    + ((stack1 = container.invokePartial(partials["glossary-single"],depth0,{"name":"glossary-single","data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : ""); +},"50":function(container,depth0,helpers,partials,data) { +    var stack1; + +  return ((stack1 = container.invokePartial(partials["glossary-single"],((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1)) != null ? stack1["0"] : stack1),{"name":"glossary-single","data":data,"indent":"            ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : ""); +},"52":function(container,depth0,helpers,partials,data) { +    var stack1; + +  return ((stack1 = container.invokePartial(partials["glossary-single"],(depth0 != null ? depth0.definition : depth0),{"name":"glossary-single","data":data,"indent":"        ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : ""); +},"54":function(container,depth0,helpers,partials,data) { +    return "</div>"; +},"56":function(container,depth0,helpers,partials,data) { +    var stack1; +    return "    " -    + container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.kunyomi : stack1), depth0)) +    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.kunyomi : stack1),{"name":"each","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")      + "\n"; -},"46":function(container,depth0,helpers,partials,data) { +},"58":function(container,depth0,helpers,partials,data) {      var stack1;    return "    " -    + container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.onyomi : stack1), depth0)) +    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.onyomi : stack1),{"name":"each","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")      + "\n"; -},"48":function(container,depth0,helpers,partials,data) { +},"60":function(container,depth0,helpers,partials,data) {      var stack1;    return "    " -    + container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1), depth0)) +    + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.modeTermKana : depth0),{"name":"unless","hash":{},"fn":container.program(28, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")      + "\n"; -},"50":function(container,depth0,helpers,partials,data) { +},"62":function(container,depth0,helpers,partials,data) {      var stack1;    return "    "      + container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.sentence : stack1), depth0))      + "\n"; -},"52":function(container,depth0,helpers,partials,data) { +},"64":function(container,depth0,helpers,partials,data) {      var stack1;    return "    "      + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.tags : stack1),{"name":"each","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")      + "\n"; -},"54":function(container,depth0,helpers,partials,data) { +},"66":function(container,depth0,helpers,partials,data) {      var stack1;    return "    " -    + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(55, data, 0),"inverse":container.program(57, data, 0),"data":data})) != null ? stack1 : "") +    + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(67, data, 0),"inverse":container.program(69, data, 0),"data":data})) != null ? stack1 : "")      + "\n"; -},"55":function(container,depth0,helpers,partials,data) { +},"67":function(container,depth0,helpers,partials,data) {      var stack1, alias1=container.lambda, alias2=container.escapeExpression;    return "<a href=\"" @@ -215,32 +243,32 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti      + "\">"      + alias2(alias1(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.url : stack1), depth0))      + "</a>"; -},"57":function(container,depth0,helpers,partials,data) { +},"69":function(container,depth0,helpers,partials,data) {      var stack1;    return container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.url : stack1), depth0));  },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data,blockParams,depths) {      var stack1; -  return "\n\n\n\n\n\n\n\n\n\n\n\n\n\n" +  return "\n\n\n\n\n\n\n\n\n\n\n\n\n"      + ((stack1 = container.invokePartial(helpers.lookup.call(depth0 != null ? depth0 : {},depth0,"marker",{"name":"lookup","hash":{},"data":data}),depth0,{"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");  },"main_d":  function(fn, props, container, depth0, data, blockParams, depths) {    var decorators = container.decorators; -  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(1, data, 0, blockParams, depths),"inverse":container.noop,"args":["definition"],"data":data}) || fn; +  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(1, data, 0, blockParams, depths),"inverse":container.noop,"args":["glossary-single"],"data":data}) || fn;    fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(20, data, 0, blockParams, depths),"inverse":container.noop,"args":["audio"],"data":data}) || fn;    fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(22, data, 0, blockParams, depths),"inverse":container.noop,"args":["character"],"data":data}) || fn;    fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(24, data, 0, blockParams, depths),"inverse":container.noop,"args":["dictionary"],"data":data}) || fn;    fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(26, data, 0, blockParams, depths),"inverse":container.noop,"args":["expression"],"data":data}) || fn;    fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(32, data, 0, blockParams, depths),"inverse":container.noop,"args":["furigana"],"data":data}) || fn; -  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(35, data, 0, blockParams, depths),"inverse":container.noop,"args":["glossary"],"data":data}) || fn; -  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(44, data, 0, blockParams, depths),"inverse":container.noop,"args":["kunyomi"],"data":data}) || fn; -  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(46, data, 0, blockParams, depths),"inverse":container.noop,"args":["onyomi"],"data":data}) || fn; -  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(48, data, 0, blockParams, depths),"inverse":container.noop,"args":["reading"],"data":data}) || fn; -  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(50, data, 0, blockParams, depths),"inverse":container.noop,"args":["sentence"],"data":data}) || fn; -  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(52, data, 0, blockParams, depths),"inverse":container.noop,"args":["tags"],"data":data}) || fn; -  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(54, data, 0, blockParams, depths),"inverse":container.noop,"args":["url"],"data":data}) || fn; +  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(39, data, 0, blockParams, depths),"inverse":container.noop,"args":["glossary"],"data":data}) || fn; +  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(56, data, 0, blockParams, depths),"inverse":container.noop,"args":["kunyomi"],"data":data}) || fn; +  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(58, data, 0, blockParams, depths),"inverse":container.noop,"args":["onyomi"],"data":data}) || fn; +  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(60, data, 0, blockParams, depths),"inverse":container.noop,"args":["reading"],"data":data}) || fn; +  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(62, data, 0, blockParams, depths),"inverse":container.noop,"args":["sentence"],"data":data}) || fn; +  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(64, data, 0, blockParams, depths),"inverse":container.noop,"args":["tags"],"data":data}) || fn; +  fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(66, data, 0, blockParams, depths),"inverse":container.noop,"args":["url"],"data":data}) || fn;    return fn;    } diff --git a/tmpl/fields.html b/tmpl/fields.html index d5c9f1db..8eead5ce 100644 --- a/tmpl/fields.html +++ b/tmpl/fields.html @@ -1,16 +1,23 @@ -{{#*inline "definition"}} -    {{#if html}} -        {{#if definition.tags}} -            (<div>{{#each definition.tags}}{{name}}{{#unless @last}}, {{/unless}}{{/each}}</div>) -        {{/if}} -        {{#if definition.glossary.[1]}} -            <ul>{{#each definition.glossary}}<li>>{{#multiLine}}{{.}}{{/multiLine}}></li>{{/each}}</ul> -        {{else}} -            <div>{{#multiLine}}{{definition.glossary.[0]}}{{/multiLine}}</div> -        {{/if}} -    {{else}} -        {{#if definition.tags}}({{#each definition.tags}}{{name}}{{#unless @last}}, {{/unless}}{{/each}}) {{/if}}{{#if definition.glossary.[1]}}{{#each definition.glossary}}{{.}}{{#unless @last}}, {{/unless}}{{/each}}{{else}}{{definition.glossary.[0]}}{{/if}} -    {{/if}} +{{#*inline "glossary-single"}} +    {{~#if html~}} +        {{~#if tags~}} +            <div>({{#each tags}}{{name}}{{#unless @last}}, {{/unless}}{{/each}})</div> +        {{~/if~}} +        {{~#if glossary.[1]~}} +            <ul>{{#each glossary}}<li>>{{#multiLine}}{{.}}{{/multiLine}}></li>{{/each}}</ul> +        {{~else~}} +            <div>{{#multiLine}}{{glossary.[0]}}{{/multiLine}}</div> +        {{~/if~}} +    {{~else~}} +        {{~#if tags~}} +            ({{#each tags}}{{name}}{{#unless @last}}, {{/unless}}{{/each}}) +        {{~/if~}} +        {{~#if glossary.[1]~}} +            {{#each glossary}}{{.}}{{#unless @last}}, {{/unless}}{{/each}} +        {{~else~}} +            {{glossary.[0]}} +        {{~/if~}} +    {{~/if~}}  {{/inline}}  {{#*inline "audio"}}{{/inline}} @@ -28,37 +35,38 @@  {{/inline}}  {{#*inline "furigana"}} -    {{#if definition.reading}}<ruby>{{definition.expression}}<rt>{{definition.reading}}</rt></ruby>{{else}}{{definition.expression}}{{/if}} +    {{~#if html~}} +        {{~#if definition.reading}}<ruby>{{definition.expression}}<rt>{{definition.reading}}</rt></ruby>{{else}}{{definition.expression}}{{/if~}} +    {{~else~}} +        {{~#if definition.reading}}{{definition.expression}} [{{definition.reading}}]{{else}}{{definition.expression}}{{/if~}} +    {{~/if~}}  {{/inline}}  {{#*inline "glossary"}} -<div style="text-align: left;"> -{{#if group}} -    {{#if definitions.[1]}} -    <ol> -        {{#each definitions}} -            <li>{{> definition}}</li> -        {{/each}} -    </ol> -    {{else}} -        {{> definition definitions.[0]}} -    {{/if}} -{{else}} -    {{> definition}} -{{/if}} -</div> +    {{~#if html}}<div style="text-align: left;">{{/if~}} +    {{~#if group~}} +        {{~#if definition.definitions.[1]~}} +            {{~#if html}}<ol>{{#each definition.definitions}}<li>{{> glossary-single}}</li>{{/each}}</ol> +            {{~else}}{{#each definition.definitions}}* {{> glossary-single}}{{/each}}{{/if~}} +        {{~else~}} +            {{> glossary-single definition.definitions.[0]}} +        {{~/if~}} +    {{~else~}} +        {{> glossary-single definition}} +    {{~/if~}} +    {{~#if html}}</div>{{/if~}}  {{/inline}}  {{#*inline "kunyomi"}} -    {{definition.kunyomi}} +    {{#each definition.kunyomi}}{{.}}{{#unless @last}}, {{/unless}}{{/each}}  {{/inline}}  {{#*inline "onyomi"}} -    {{definition.onyomi}} +    {{#each definition.onyomi}}{{.}}{{#unless @last}}, {{/unless}}{{/each}}  {{/inline}}  {{#*inline "reading"}} -    {{definition.reading}} +    {{#unless modeTermKana}}{{definition.reading}}{{/unless}}  {{/inline}}  {{#*inline "sentence"}} @@ -73,4 +81,4 @@      {{#if html}}<a href="{{definition.url}}">{{definition.url}}</a>{{else}}{{definition.url}}{{/if}}  {{/inline}} -{{> (lookup . "marker") }} +{{~> (lookup . "marker") ~}}  |