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

2 files changed, 6 insertions, 2 deletions

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;