From d98f4566bc856e04f2f6a7d9a7bf49e30867551e Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Sat, 17 Dec 2016 18:45:19 -0800 Subject: WIP --- tmpl/kanji.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tmpl/kanji.html') diff --git a/tmpl/kanji.html b/tmpl/kanji.html index daa825be..c40bb3bc 100644 --- a/tmpl/kanji.html +++ b/tmpl/kanji.html @@ -30,7 +30,7 @@
{{#each tags}} - {{name}} + {{tag}} {{/each}}
-- cgit v1.2.3 From 5c755043fa2fb23f94f898fc57828277d7b02049 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Sat, 17 Dec 2016 19:30:26 -0800 Subject: CWIP --- ext/bg/js/database.js | 4 ++-- ext/bg/js/templates.js | 4 ++-- ext/bg/js/translator.js | 4 ++-- ext/bg/js/util.js | 2 +- tmpl/kanji.html | 2 +- tmpl/term.html | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) (limited to 'tmpl/kanji.html') diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js index 05cb8acd..980e9e40 100644 --- a/ext/bg/js/database.js +++ b/ext/bg/js/database.js @@ -231,7 +231,7 @@ class Database { for (const tag in tagMeta || {}) { const meta = tagMeta[tag]; rows.push({ - tag, + name: tag, category: meta.category, notes: meta.notes, order: meta.order, @@ -252,8 +252,8 @@ class Database { reading, tags, rules, + score, glossary, - score: parseInt(score), dictionary: title }); } diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js index 2070f276..1e35f17e 100644 --- a/ext/bg/js/templates.js +++ b/ext/bg/js/templates.js @@ -70,7 +70,7 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia + "\" title=\"" + alias4(((helper = (helper = helpers.notes || (depth0 != null ? depth0.notes : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"notes","hash":{},"data":data}) : helper))) + "\">" - + alias4(((helper = (helper = helpers.tag || (depth0 != null ? depth0.tag : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"tag","hash":{},"data":data}) : helper))) + + alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper))) + "\n"; },"8":function(container,depth0,helpers,partials,data) { return "
  • " @@ -194,7 +194,7 @@ templates['term.html'] = template({"1":function(container,depth0,helpers,partial + "\" title=\"" + alias4(((helper = (helper = helpers.notes || (depth0 != null ? depth0.notes : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"notes","hash":{},"data":data}) : helper))) + "\">" - + alias4(((helper = (helper = helpers.tag || (depth0 != null ? depth0.tag : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"tag","hash":{},"data":data}) : helper))) + + alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper))) + "\n"; },"15":function(container,depth0,helpers,partials,data) { return "
  • " diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js index 1d143320..13bf1427 100644 --- a/ext/bg/js/translator.js +++ b/ext/bg/js/translator.js @@ -140,7 +140,7 @@ class Translator { const tagItems = []; for (const tag of definition.tags) { const tagItem = { - tag, + name: tag, category: 'default', order: Number.MAX_SAFE_INTEGER, notes: '' @@ -168,7 +168,7 @@ class Translator { const tagItems = []; for (const tag of definition.tags) { const tagItem = { - tag, + name: tag, category: 'default', order: Number.MAX_SAFE_INTEGER, notes: '' diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js index a28692dc..dc606a73 100644 --- a/ext/bg/js/util.js +++ b/ext/bg/js/util.js @@ -97,7 +97,7 @@ function sortTermDefs(definitions) { } function applyTagMeta(tag, meta) { - const symbol = tag.tag.split(':')[0]; + const symbol = tag.name.split(':')[0]; for (const prop in meta[symbol] || {}) { tag[prop] = meta[symbol][prop]; } diff --git a/tmpl/kanji.html b/tmpl/kanji.html index c40bb3bc..380e16ff 100644 --- a/tmpl/kanji.html +++ b/tmpl/kanji.html @@ -30,7 +30,7 @@
    {{#each tags}} - {{tag}} + {{name}} {{/each}}
    diff --git a/tmpl/term.html b/tmpl/term.html index fb50e7d7..36f8f4fc 100644 --- a/tmpl/term.html +++ b/tmpl/term.html @@ -23,7 +23,7 @@
    {{#each tags}} - {{tag}} + {{name}} {{/each}}
    -- cgit v1.2.3 From 04ff83cc6cc03c5ca868fcc86eeaa85d8f4e0bc8 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Sun, 18 Dec 2016 12:24:07 -0800 Subject: Don't show list numbering on glossary lists with only one item --- ext/bg/js/templates.js | 36 ++++++++++++++++++++++++++++++------ tmpl/kanji.html | 6 ++++++ tmpl/term.html | 6 ++++++ 3 files changed, 42 insertions(+), 6 deletions(-) (limited to 'tmpl/kanji.html') diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js index 1e35f17e..c9d0052c 100644 --- a/ext/bg/js/templates.js +++ b/ext/bg/js/templates.js @@ -73,9 +73,21 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia + alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper))) + "    \n"; },"8":function(container,depth0,helpers,partials,data) { + var stack1; + + return "
      \n" + + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(9, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + + "
    \n"; +},"9":function(container,depth0,helpers,partials,data) { return "
  • " + container.escapeExpression(container.lambda(depth0, depth0)) + "
    • \n"; +},"11":function(container,depth0,helpers,partials,data) { + var stack1; + + return "

    \n " + + container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["0"] : stack1), depth0)) + + "\n

    \n"; },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression; @@ -91,9 +103,9 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.onyomi : depth0),{"name":"each","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + " \n \n \n \n\n
    \n" + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") - + "
    \n\n
    \n
      \n" - + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(8, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") - + "
    \n
    \n\n"; + + " \n\n
    \n" + + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(8, data, 0),"inverse":container.program(11, data, 0),"data":data})) != null ? stack1 : "") + + "
    \n\n"; },"useData":true}); templates['kanji-link.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { var helper; @@ -197,9 +209,21 @@ templates['term.html'] = template({"1":function(container,depth0,helpers,partial + alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper))) + "\n"; },"15":function(container,depth0,helpers,partials,data) { + var stack1; + + return "
      \n" + + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(16, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + + "
    \n"; +},"16":function(container,depth0,helpers,partials,data) { return "
  • " + container.escapeExpression(container.lambda(depth0, depth0)) + "
    • \n"; +},"18":function(container,depth0,helpers,partials,data) { + var stack1; + + return "

    \n " + + container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["0"] : stack1), depth0)) + + "\n

    \n"; },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { var stack1, helper, alias1=depth0 != null ? depth0 : {}; @@ -214,9 +238,9 @@ templates['term.html'] = template({"1":function(container,depth0,helpers,partial + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.rules : depth0),{"name":"each","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + " \n\n
    \n" + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(13, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") - + "
    \n\n
    \n
      \n" - + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(15, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") - + "
    \n
    \n\n"; + + " \n\n
    \n" + + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(15, data, 0),"inverse":container.program(18, data, 0),"data":data})) != null ? stack1 : "") + + "
    \n\n"; },"useData":true}); templates['term-list.html'] = template({"1":function(container,depth0,helpers,partials,data,blockParams,depths) { var stack1; diff --git a/tmpl/kanji.html b/tmpl/kanji.html index 380e16ff..e22dd660 100644 --- a/tmpl/kanji.html +++ b/tmpl/kanji.html @@ -35,10 +35,16 @@
    + {{#if glossary.[1]}}
      {{#each glossary}}
    1. {{.}}
      2. {{/each}}
    + {{else}} +

    + {{glossary.[0]}} +

    + {{/if}}
    diff --git a/tmpl/term.html b/tmpl/term.html index 36f8f4fc..6185ca25 100644 --- a/tmpl/term.html +++ b/tmpl/term.html @@ -28,10 +28,16 @@
    + {{#if glossary.[1]}}
      {{#each glossary}}
    1. {{.}}
      2. {{/each}}
    + {{else}} +

    + {{glossary.[0]}} +

    + {{/if}}
    -- cgit v1.2.3