summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorsiikamiika <siikamiika@users.noreply.github.com>2017-10-08 03:37:28 +0300
committersiikamiika <siikamiika@users.noreply.github.com>2017-10-08 03:37:28 +0300
commit7b9ad61352dcb7ebaf8f3c5e5b2adeb32e14fae1 (patch)
tree6e0ef94db1b65e81ce098145cbfd94ab54b8f801 /ext
parent94d590fc85f87028d8264e93c8ad58c71d0977f2 (diff)
merged mode: fix regression (voice), tweak hover
Alt+P now works again in grouped/split mode In merged mode, 「、」 is added even after the last term, but it's hidden for that. This ensures consistent behavior with voice button and tags
Diffstat (limited to 'ext')
-rw-r--r--ext/bg/js/templates.js8
-rw-r--r--ext/mixed/css/display.css4
-rw-r--r--ext/mixed/js/display.js4
3 files changed, 10 insertions, 6 deletions
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index 01507e1c..a89fdbb5 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -305,9 +305,9 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
return buffer + "</span><!--\n --><div class=\"peek-wrapper\">"
+ ((stack1 = helpers["if"].call(alias1,(depths[1] != null ? depths[1].playback : depths[1]),{"name":"if","hash":{},"fn":container.program(27, 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(29, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
- + "<!--\n --><span style=\"display: inline-block;\"></span><!--\n --></div><!--\n -->"
- + ((stack1 = helpers.unless.call(alias1,(data && data.last),{"name":"unless","hash":{},"fn":container.program(32, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
- + "\n </div>\n";
+ + "<!--\n --><span style=\"display: inline-block;\"></span><!--\n --></div><!--\n --><span class=\""
+ + ((stack1 = helpers["if"].call(alias1,(data && data.last),{"name":"if","hash":{},"fn":container.program(32, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ + "\">、</span><!--\n --></div>\n";
},"24":function(container,depth0,helpers,partials,data) {
var stack1, helper, options;
@@ -337,7 +337,7 @@ templates['terms.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)))
+ "</span>\n";
},"32":function(container,depth0,helpers,partials,data) {
- return "、";
+ return "invisible";
},"34":function(container,depth0,helpers,partials,data) {
var stack1, helper, options, buffer =
" <div class=\"expression\">";
diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index 147256bf..fe2f6bbe 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -46,6 +46,10 @@ hr {
display: none;
}
+.invisible {
+ visibility: hidden;
+}
+
/*
* Entries
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index e54c8b18..a335c694 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -73,7 +73,7 @@ class Display {
e.preventDefault();
const link = $(e.currentTarget);
const definitionIndex = Display.entryIndexFind(link);
- const expressionIndex = $(e.currentTarget).closest('.entry').find('.expression .action-play-audio').index(link);
+ const expressionIndex = link.closest('.entry').find('.expression .action-play-audio').index(link);
this.audioPlay(this.definitions[definitionIndex], expressionIndex);
}
@@ -185,7 +185,7 @@ class Display {
80: /* p */ () => {
if (e.altKey) {
if ($('.entry').eq(this.index).data('type') === 'term') {
- this.audioPlay(this.definitions[this.index]);
+ this.audioPlay(this.definitions[this.index], -1);
}
return true;