\n
\n"
+ return "
\n
\n
\n"
+ ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.addable : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.source : depth0),{"name":"if","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ "
\n\n
"
@@ -299,9 +299,9 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
+ ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(11, data, 0),"inverse":container.program(15, data, 0),"data":data})) != null ? stack1 : "")
+ "
\n
\n";
},"2":function(container,depth0,helpers,partials,data) {
- return "
\n";
+ return "
\n";
},"4":function(container,depth0,helpers,partials,data) {
- return "
\n";
+ return "
\n";
},"6":function(container,depth0,helpers,partials,data) {
var stack1;
@@ -442,7 +442,7 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
},"12":function(container,depth0,helpers,partials,data) {
var stack1, alias1=depth0 != null ? depth0 : {};
- return "
\n
\n
\n"
+ return "
\n
\n
\n"
+ ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.addable : depth0),{"name":"if","hash":{},"fn":container.program(13, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.playback : depth0),{"name":"if","hash":{},"fn":container.program(15, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ "
\n\n"
@@ -453,9 +453,9 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
+ ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.grouped : depth0),{"name":"if","hash":{},"fn":container.program(26, data, 0),"inverse":container.program(32, data, 0),"data":data})) != null ? stack1 : "")
+ "
\n
\n";
},"13":function(container,depth0,helpers,partials,data) {
- return "
\n
\n";
+ return "
\n
\n";
},"15":function(container,depth0,helpers,partials,data) {
- return "
\n";
+ return "
\n";
},"17":function(container,depth0,helpers,partials,data) {
var stack1, helper, options, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", buffer =
"
";
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index 639c2673..1b629dec 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -164,16 +164,7 @@ class Display {
onSourceTerm(e) {
e.preventDefault();
-
- if (this.context && this.context.source) {
- const context = {
- url: this.context.source.url,
- sentence: this.context.source.sentence,
- index: this.context.source.index
- };
-
- this.showTermDefs(this.context.source.definitions, this.options, context);
- }
+ this.sourceBack();
}
onKanjiLookup(e) {
@@ -247,6 +238,10 @@ class Display {
this.entryScroll(this.index + 1, true);
},
+ 66: /* b */ () => {
+ this.sourceBack();
+ },
+
69: /* e */ () => {
noteTryAdd('term-kanji');
},
@@ -260,7 +255,7 @@ class Display {
},
80: /* p */ () => {
- if (Display.adderButtonFind(this.index, 'kanji').length === 0) {
+ if ($('.entry').eq(this.index).data('type') === 'term') {
this.audioPlay(this.definitions[this.index]);
}
}
@@ -273,6 +268,18 @@ class Display {
}
}
+ sourceBack() {
+ if (this.context && this.context.source) {
+ const context = {
+ url: this.context.source.url,
+ sentence: this.context.source.sentence,
+ index: this.context.source.index
+ };
+
+ this.showTermDefs(this.context.source.definitions, this.options, context);
+ }
+ }
+
noteAdd(definition, mode) {
this.spinner.show();
return this.definitionAdd(definition, mode).then(success => {
diff --git a/tmpl/kanji.html b/tmpl/kanji.html
index be5e8541..7a2df8db 100644
--- a/tmpl/kanji.html
+++ b/tmpl/kanji.html
@@ -1,12 +1,12 @@
{{#*inline "kanji"}}
-
+
-
+
{{#if addable}}
-
+
{{/if}}
{{#if source}}
-
+
{{/if}}
diff --git a/tmpl/terms.html b/tmpl/terms.html
index f108da26..83b16106 100644
--- a/tmpl/terms.html
+++ b/tmpl/terms.html
@@ -18,15 +18,15 @@
{{/inline}}
{{#*inline "term"}}
-
+
-
+
{{#if addable}}
-
-
+
+
{{/if}}
{{#if playback}}
-
+
{{/if}}