aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Yatskov <alex@foosoft.net>2016-04-18 19:38:03 -0700
committerAlex Yatskov <alex@foosoft.net>2016-04-18 19:38:03 -0700
commitc4e35fbf54a9cd80e27d600d47b24b1afdfeca6d (patch)
treeab215a66592e3ec41ce6f2c1a21b64dbda5a9df3
parentf8d2cc1b0369e6350a91d540ef6165cd7dc50040 (diff)
Display tooltips for tags
-rw-r--r--ext/bg/js/templates.js8
-rw-r--r--ext/bg/js/translator.js25
-rw-r--r--ext/fg/css/popup.css1
-rw-r--r--util/tmpl/term.html2
4 files changed, 27 insertions, 9 deletions
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index cacd8808..1609cc97 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -77,8 +77,12 @@ templates['term.html'] = template({"1":function(container,depth0,helpers,partial
+ ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(11, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ "</div>\n";
},"11":function(container,depth0,helpers,partials,data) {
- return " <span class=\"tag\">"
- + container.escapeExpression(container.lambda(depth0, depth0))
+ var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
+
+ return " <span class=\"tag\" title=\""
+ + alias4(((helper = (helper = helpers.desc || (depth0 != null ? depth0.desc : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"desc","hash":{},"data":data}) : helper)))
+ + "\">"
+ + alias4(((helper = (helper = helpers.key || (data && data.key)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"key","hash":{},"data":data}) : helper)))
+ "</span>\n";
},"13":function(container,depth0,helpers,partials,data) {
return " <li><span>"
diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index 1a024a40..e2d15e46 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -19,14 +19,16 @@
class Translator {
constructor() {
- this.loaded = false;
- this.paths = {
+ this.paths = {
rules: 'bg/data/rules.json',
+ tags: 'bg/data/tags.json',
edict: 'bg/data/edict.json',
enamdict: 'bg/data/enamdict.json',
kanjidic: 'bg/data/kanjidic.json'
};
+ this.loaded = false;
+ this.tags = null;
this.dictionary = new Dictionary();
this.deinflector = new Deinflector();
}
@@ -38,13 +40,16 @@ class Translator {
}
const pendingLoads = [];
- for (const key of ['rules', 'edict', 'enamdict', 'kanjidic']) {
+ for (const key of ['rules', 'tags', 'edict', 'enamdict', 'kanjidic']) {
pendingLoads.push(key);
Translator.loadData(this.paths[key], (response) => {
switch (key) {
case 'rules':
this.deinflector.setRules(JSON.parse(response));
break;
+ case 'tags':
+ this.tags = JSON.parse(response);
+ break;
case 'kanjidic':
this.dictionary.addKanjiDict(key, JSON.parse(response));
break;
@@ -98,8 +103,8 @@ class Translator {
return 1;
}
- const p1 = v1.tags.indexOf('P') >= 0;
- const p2 = v2.tags.indexOf('P') >= 0;
+ const p1 = v1.tags.hasOwnProperty('P');
+ const p2 = v2.tags.hasOwnProperty('P');
if (p1 && !p2) {
return -1;
} else if (!p1 && p2) {
@@ -153,12 +158,20 @@ class Translator {
}
}
+ let tagInfo = {};
+ for (const tag of entry.tags) {
+ const info = this.tags[tag];
+ if (info) {
+ tagInfo[tag] = info;
+ }
+ }
+
if (matched) {
groups[entry.id] = {
expression: entry.expression,
reading: entry.reading,
glossary: entry.glossary,
- tags: entry.tags,
+ tags: tagInfo,
source: source,
rules: rules
};
diff --git a/ext/fg/css/popup.css b/ext/fg/css/popup.css
index 2e694b42..1c40bdfd 100644
--- a/ext/fg/css/popup.css
+++ b/ext/fg/css/popup.css
@@ -46,6 +46,7 @@ body {
background-color: #777;
border-radius: 0.25em;
color: #fff;
+ cursor: default;
display: inline;
font-size: 75%;
font-weight: 700;
diff --git a/util/tmpl/term.html b/util/tmpl/term.html
index 8c0e54ca..abcbb215 100644
--- a/util/tmpl/term.html
+++ b/util/tmpl/term.html
@@ -15,7 +15,7 @@
{{#if tags}}
<div class="tags">
{{#each tags}}
- <span class="tag">{{.}}</span>
+ <span class="tag" title="{{desc}}">{{@key}}</span>
{{/each}}
</div>
{{/if}}