From 8926eeab4501724ce4627ae9cff97963f2bd2b72 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Tue, 3 May 2016 22:07:05 -0700 Subject: WIP --- ext/bg/js/templates.js | 110 +++++++++++++++++++----------------- ext/fg/css/frame.css | 5 ++ ext/fg/img/add_expression.png | Bin 0 -> 733 bytes ext/fg/img/add_kanji.png | Bin 0 -> 733 bytes ext/fg/img/add_reading.png | Bin 0 -> 286 bytes ext/fg/img/icon_add_expression.png | Bin 733 -> 0 bytes ext/fg/img/icon_add_reading.png | Bin 286 -> 0 bytes ext/fg/img/icon_copy_definition.png | Bin 663 -> 0 bytes ext/fg/js/client.js | 2 +- ext/manifest.json | 6 +- util/tmpl/kanji.html | 7 ++- util/tmpl/term.html | 14 ++++- 12 files changed, 82 insertions(+), 62 deletions(-) create mode 100644 ext/fg/img/add_expression.png create mode 100644 ext/fg/img/add_kanji.png create mode 100644 ext/fg/img/add_reading.png delete mode 100644 ext/fg/img/icon_add_expression.png delete mode 100644 ext/fg/img/icon_add_reading.png delete mode 100644 ext/fg/img/icon_copy_definition.png diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js index e47364d1..b523936a 100644 --- a/ext/bg/js/templates.js +++ b/ext/bg/js/templates.js @@ -19,55 +19,55 @@ templates['header.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(c templates['kanji.html'] = template({"1":function(container,depth0,helpers,partials,data,blockParams,depths) { var stack1; - return " " - + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.kanji : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "") - + "\n"; + return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.kanji : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0, blockParams, depths),"inverse":container.program(4, data, 0, blockParams, depths),"data":data})) != null ? stack1 : ""); },"2":function(container,depth0,helpers,partials,data,blockParams,depths) { - return "\n"; +},"4":function(container,depth0,helpers,partials,data,blockParams,depths) { + return " "; -},"4":function(container,depth0,helpers,partials,data) { + + "/add_kanji.png\" class=\"inactive\">\n"; +},"6":function(container,depth0,helpers,partials,data) { var stack1; return "
Meanings
\n
\n" - + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + "
\n"; -},"5":function(container,depth0,helpers,partials,data) { +},"7":function(container,depth0,helpers,partials,data) { var stack1; return " " + container.escapeExpression(container.lambda(depth0, depth0)) - + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.last),{"name":"unless","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.last),{"name":"unless","hash":{},"fn":container.program(8, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + "\n"; -},"6":function(container,depth0,helpers,partials,data) { - return ", "; },"8":function(container,depth0,helpers,partials,data) { + return ", "; +},"10":function(container,depth0,helpers,partials,data) { var stack1; return "
Kunyomi
\n
\n" - + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.kunyomi : depth0),{"name":"each","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.kunyomi : depth0),{"name":"each","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + "
\n"; -},"10":function(container,depth0,helpers,partials,data) { +},"12":function(container,depth0,helpers,partials,data) { var stack1; return "
Onyomi
\n
\n" - + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.onyomi : depth0),{"name":"each","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.onyomi : depth0),{"name":"each","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + "
\n"; },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data,blockParams,depths) { - var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression; + var stack1, helper, alias1=depth0 != null ? depth0 : {}; return "
\n
\n" + ((stack1 = helpers["with"].call(alias1,(depth0 != null ? depth0.addable : depth0),{"name":"with","hash":{},"fn":container.program(1, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "") - + " \n
\n\n
" - + alias4(((helper = (helper = helpers.character || (depth0 != null ? depth0.character : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"character","hash":{},"data":data}) : helper))) + + "
\n\n
" + + container.escapeExpression(((helper = (helper = helpers.character || (depth0 != null ? depth0.character : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(alias1,{"name":"character","hash":{},"data":data}) : helper))) + "
\n\n
\n
\n" - + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.glossary : depth0),{"name":"if","hash":{},"fn":container.program(4, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "") + + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.glossary : depth0),{"name":"if","hash":{},"fn":container.program(6, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "") + "\n" - + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.kunyomi : depth0),{"name":"if","hash":{},"fn":container.program(8, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "") + + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.kunyomi : depth0),{"name":"if","hash":{},"fn":container.program(10, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "") + "\n" - + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.onyomi : depth0),{"name":"if","hash":{},"fn":container.program(10, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "") + + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.onyomi : depth0),{"name":"if","hash":{},"fn":container.program(12, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "") + "
\n
\n
\n\n"; },"useData":true,"useDepths":true}); templates['kanji-link.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { @@ -91,62 +91,68 @@ templates['kanji-list.html'] = template({"1":function(container,depth0,helpers,p templates['term.html'] = template({"1":function(container,depth0,helpers,partials,data,blockParams,depths) { var stack1, alias1=depth0 != null ? depth0 : {}; - return " " - + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.vocabExp : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "") - + "\n " - + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.vocabReading : depth0),{"name":"if","hash":{},"fn":container.program(4, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "") - + "\n"; + return ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.vocabExp : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0, blockParams, depths),"inverse":container.program(4, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "") + + "\n" + + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.vocabReading : depth0),{"name":"if","hash":{},"fn":container.program(6, data, 0, blockParams, depths),"inverse":container.program(8, data, 0, blockParams, depths),"data":data})) != null ? stack1 : ""); },"2":function(container,depth0,helpers,partials,data,blockParams,depths) { - return ""; + + "/img/add_expression.png\">\n"; },"4":function(container,depth0,helpers,partials,data,blockParams,depths) { - return ""; -},"6":function(container,depth0,helpers,partials,data) { + + "/img/add_expression.png\" class=\"inactive\">\n"; +},"6":function(container,depth0,helpers,partials,data,blockParams,depths) { + return " \n"; +},"8":function(container,depth0,helpers,partials,data,blockParams,depths) { + return " \n"; +},"10":function(container,depth0,helpers,partials,data) { var stack1, helper, options, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", buffer = "
"; - stack1 = ((helper = (helper = helpers.kanjiLinks || (depth0 != null ? depth0.kanjiLinks : depth0)) != null ? helper : alias2),(options={"name":"kanjiLinks","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data}),(typeof helper === alias3 ? helper.call(alias1,options) : helper)); + stack1 = ((helper = (helper = helpers.kanjiLinks || (depth0 != null ? depth0.kanjiLinks : depth0)) != null ? helper : alias2),(options={"name":"kanjiLinks","hash":{},"fn":container.program(11, 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 + "" + container.escapeExpression(((helper = (helper = helpers.reading || (depth0 != null ? depth0.reading : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"reading","hash":{},"data":data}) : helper))) + "
\n"; -},"7":function(container,depth0,helpers,partials,data) { +},"11":function(container,depth0,helpers,partials,data) { var helper; return container.escapeExpression(((helper = (helper = helpers.expression || (depth0 != null ? depth0.expression : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"expression","hash":{},"data":data}) : helper))); -},"9":function(container,depth0,helpers,partials,data) { +},"13":function(container,depth0,helpers,partials,data) { var stack1, helper, options, buffer = "
"; - stack1 = ((helper = (helper = helpers.kanjiLinks || (depth0 != null ? depth0.kanjiLinks : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"kanjiLinks","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper)); + stack1 = ((helper = (helper = helpers.kanjiLinks || (depth0 != null ? depth0.kanjiLinks : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"kanjiLinks","hash":{},"fn":container.program(11, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper)); if (!helpers.kanjiLinks) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)} if (stack1 != null) { buffer += stack1; } return buffer + "
\n"; -},"11":function(container,depth0,helpers,partials,data) { +},"15":function(container,depth0,helpers,partials,data) { var stack1; return "
\n" - + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.rules : depth0),{"name":"each","hash":{},"fn":container.program(12, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.rules : depth0),{"name":"each","hash":{},"fn":container.program(16, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + "
\n"; -},"12":function(container,depth0,helpers,partials,data) { +},"16":function(container,depth0,helpers,partials,data) { var stack1; return " " + container.escapeExpression(container.lambda(depth0, depth0)) + " " - + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.last),{"name":"unless","hash":{},"fn":container.program(13, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.last),{"name":"unless","hash":{},"fn":container.program(17, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + "\n"; -},"13":function(container,depth0,helpers,partials,data) { +},"17":function(container,depth0,helpers,partials,data) { return "«"; -},"15":function(container,depth0,helpers,partials,data) { +},"19":function(container,depth0,helpers,partials,data) { var stack1; return "
\n" - + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(16, 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(20, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + "
\n"; -},"16":function(container,depth0,helpers,partials,data) { +},"20":function(container,depth0,helpers,partials,data) { var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression; return " " + 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"; -},"18":function(container,depth0,helpers,partials,data) { +},"22":function(container,depth0,helpers,partials,data) { return "
  • " + container.escapeExpression(container.lambda(depth0, depth0)) + "
    • \n"; },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data,blockParams,depths) { - var stack1, helper, alias1=depth0 != null ? depth0 : {}; + var stack1, alias1=depth0 != null ? depth0 : {}; return "
    \n
    \n" + ((stack1 = helpers["with"].call(alias1,(depth0 != null ? depth0.addable : depth0),{"name":"with","hash":{},"fn":container.program(1, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "") - + " \n
    \n\n" - + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.reading : depth0),{"name":"if","hash":{},"fn":container.program(6, data, 0, blockParams, depths),"inverse":container.program(9, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "") + + "
    \n\n" + + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.reading : depth0),{"name":"if","hash":{},"fn":container.program(10, data, 0, blockParams, depths),"inverse":container.program(13, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "") + "\n" - + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.rules : depth0),{"name":"if","hash":{},"fn":container.program(11, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "") + + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.rules : depth0),{"name":"if","hash":{},"fn":container.program(15, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "") + "\n" - + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.tags : depth0),{"name":"if","hash":{},"fn":container.program(15, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "") + + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.tags : depth0),{"name":"if","hash":{},"fn":container.program(19, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "") + "\n
    \n
      \n" - + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(18, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "") + + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(22, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "") + "
    \n
    \n\n"; },"useData":true,"useDepths":true}); templates['term-list.html'] = template({"1":function(container,depth0,helpers,partials,data,blockParams,depths) { diff --git a/ext/fg/css/frame.css b/ext/fg/css/frame.css index d28816f8..956ade8b 100644 --- a/ext/fg/css/frame.css +++ b/ext/fg/css/frame.css @@ -68,6 +68,11 @@ body { display: block; } +.action-icons .inactive { + -webkit-filter: grayscale(100%); + opacity: 0.25; +} + /* term styles */ .term-expression { diff --git a/ext/fg/img/add_expression.png b/ext/fg/img/add_expression.png new file mode 100644 index 00000000..6332fefe Binary files /dev/null and b/ext/fg/img/add_expression.png differ diff --git a/ext/fg/img/add_kanji.png b/ext/fg/img/add_kanji.png new file mode 100644 index 00000000..6332fefe Binary files /dev/null and b/ext/fg/img/add_kanji.png differ diff --git a/ext/fg/img/add_reading.png b/ext/fg/img/add_reading.png new file mode 100644 index 00000000..41ff8335 Binary files /dev/null and b/ext/fg/img/add_reading.png differ diff --git a/ext/fg/img/icon_add_expression.png b/ext/fg/img/icon_add_expression.png deleted file mode 100644 index 6332fefe..00000000 Binary files a/ext/fg/img/icon_add_expression.png and /dev/null differ diff --git a/ext/fg/img/icon_add_reading.png b/ext/fg/img/icon_add_reading.png deleted file mode 100644 index 41ff8335..00000000 Binary files a/ext/fg/img/icon_add_reading.png and /dev/null differ diff --git a/ext/fg/img/icon_copy_definition.png b/ext/fg/img/icon_copy_definition.png deleted file mode 100644 index 195dc6d6..00000000 Binary files a/ext/fg/img/icon_copy_definition.png and /dev/null differ diff --git a/ext/fg/js/client.js b/ext/fg/js/client.js index 8393e58c..1f7f7633 100644 --- a/ext/fg/js/client.js +++ b/ext/fg/js/client.js @@ -105,7 +105,7 @@ class Client { } else { range.setLength(length); renderText( - {defs: results, root: this.fgRoot}, + {defs: results, root: this.fgRoot, options: this.options}, 'term-list.html', (content) => this.showPopup(range, content) ); diff --git a/ext/manifest.json b/ext/manifest.json index a99f0730..a5ced735 100644 --- a/ext/manifest.json +++ b/ext/manifest.json @@ -25,9 +25,9 @@ "fg/css/frame.css", "fg/js/frame.js", "fg/ttf/kanji-stroke-orders.ttf", - "fg/img/icon_add_expression.png", - "fg/img/icon_add_reading.png", - "fg/img/icon_copy_definition.png" + "fg/img/add_expression.png", + "fg/img/add_reading.png", + "fg/img/add_kanji.png" ], "content_scripts": [{ diff --git a/util/tmpl/kanji.html b/util/tmpl/kanji.html index e74fb5ae..7f797c4b 100644 --- a/util/tmpl/kanji.html +++ b/util/tmpl/kanji.html @@ -1,9 +1,12 @@
    {{#with addable}} - {{#if kanji}}{{/if}} + {{#if kanji}} + + {{else}} + + {{/if}} {{/with}} -
    {{character}}
    diff --git a/util/tmpl/term.html b/util/tmpl/term.html index f31d9da0..3d3d4eb0 100644 --- a/util/tmpl/term.html +++ b/util/tmpl/term.html @@ -1,10 +1,18 @@
    {{#with addable}} - {{#if vocabExp}}{{/if}} - {{#if vocabReading}}{{/if}} + {{#if vocabExp}} + + {{else}} + + {{/if}} + + {{#if vocabReading}} + + {{else}} + + {{/if}} {{/with}} -
    {{#if reading}} -- cgit v1.2.3