From f3d2372d52e386169de0a050c1b70ca6915c6a6c Mon Sep 17 00:00:00 2001
From: polyzen <polyzen@users.noreply.github.com>
Date: Sun, 21 Jul 2024 01:53:32 -0400
Subject: [PATCH] Backport pull request #5759 from jellyfin-web/release-10.9.z

Display previous/next keyboard shortcuts

Original-merge: 2d68f94ec6afd053f7cc7418771beb224f7c606e

Merged-by: thornbill <thornbill@users.noreply.github.com>

Backported-by: Bill Thornton <thornbill@users.noreply.github.com>
---
 src/controllers/playback/video/index.html | 18 +++++++++---------
 src/controllers/playback/video/index.js   | 11 ++++++++---
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/controllers/playback/video/index.html b/src/controllers/playback/video/index.html
index d9de34d308..a460ee8f6a 100644
--- a/src/controllers/playback/video/index.html
+++ b/src/controllers/playback/video/index.html
@@ -33,15 +33,15 @@
                         <span class="xlargePaperIconButton material-icons fiber_manual_record" aria-hidden="true"></span>
                     </button>
 
-                    <button is="paper-icon-button-light" class="btnPreviousTrack autoSize hide" title="${PreviousTrack}">
+                    <button is="paper-icon-button-light" class="btnPreviousTrack autoSize hide" title="${PreviousTrack} (Shift+P)" aria-label="${PreviousTrack}">
                         <span class="xlargePaperIconButton material-icons skip_previous" aria-hidden="true"></span>
                     </button>
 
-                    <button is="paper-icon-button-light" class="btnPreviousChapter autoSize hide" title="${PreviousChapter}">
+                    <button is="paper-icon-button-light" class="btnPreviousChapter autoSize hide" title="${PreviousChapter} (PageDown)" aria-label="${PreviousChapter}">
                         <span class="xlargePaperIconButton material-icons undo" aria-hidden="true"></span>
                     </button>
 
-                    <button is="paper-icon-button-light" class="btnRewind" title="${Rewind} (j)" aria-label="${Rewind}">
+                    <button is="paper-icon-button-light" class="btnRewind" title="${Rewind} (J)" aria-label="${Rewind}">
                         <span class="xlargePaperIconButton material-icons fast_rewind" aria-hidden="true"></span>
                     </button>
 
@@ -49,15 +49,15 @@
                         <span class="xlargePaperIconButton material-icons pause" aria-hidden="true"></span>
                     </button>
 
-                    <button is="paper-icon-button-light" class="btnFastForward" title="${FastForward} (l)" aria-label="${FastForward}">
+                    <button is="paper-icon-button-light" class="btnFastForward" title="${FastForward} (L)" aria-label="${FastForward}">
                         <span class="xlargePaperIconButton material-icons fast_forward" aria-hidden="true"></span>
                     </button>
 
-                    <button is="paper-icon-button-light" class="btnNextChapter autoSize hide" title="${NextChapter}">
+                    <button is="paper-icon-button-light" class="btnNextChapter autoSize hide" title="${NextChapter} (PageUp)" aria-label="${NextChapter}">
                         <span class="xlargePaperIconButton material-icons redo" aria-hidden="true"></span>
                     </button>
 
-                    <button is="paper-icon-button-light" class="btnNextTrack autoSize hide" title="${NextTrack}">
+                    <button is="paper-icon-button-light" class="btnNextTrack autoSize hide" title="${NextTrack} (Shift+N)" aria-label="${NextTrack}">
                         <span class="xlargePaperIconButton material-icons skip_next" aria-hidden="true"></span>
                     </button>
                 </div>
@@ -65,7 +65,7 @@
                 <div class="osdTimeText">
                     <span class="endsAtText"></span>
                 </div>
-                
+
                 <div class="osdRatingsText">
                 </div>
 
@@ -80,7 +80,7 @@
                     <span class="xlargePaperIconButton material-icons audiotrack" aria-hidden="true"></span>
                 </button>
                 <div class="volumeButtons hide-mouse-idle-tv">
-                    <button is="paper-icon-button-light" class="buttonMute autoSize" title="${Mute} (m)" aria-label="${Mute}">
+                    <button is="paper-icon-button-light" class="buttonMute autoSize" title="${Mute} (M)" aria-label="${Mute}">
                         <span class="xlargePaperIconButton material-icons volume_up" aria-hidden="true"></span>
                     </button>
                     <div class="sliderContainer osdVolumeSliderContainer">
@@ -96,7 +96,7 @@
                 <button is="paper-icon-button-light" class="btnPip hide autoSize" title="${PictureInPicture}">
                     <span class="xlargePaperIconButton material-icons picture_in_picture_alt" aria-hidden="true"></span>
                 </button>
-                <button is="paper-icon-button-light" class="btnFullscreen hide autoSize" title="${Fullscreen} (f)" aria-label="${Fullscreen}">
+                <button is="paper-icon-button-light" class="btnFullscreen hide autoSize" title="${Fullscreen} (F)" aria-label="${Fullscreen}">
                     <span class="xlargePaperIconButton material-icons fullscreen" aria-hidden="true"></span>
                 </button>
             </div>
diff --git a/src/controllers/playback/video/index.js b/src/controllers/playback/video/index.js
index 8e856497b3..71ccba3e4a 100644
--- a/src/controllers/playback/video/index.js
+++ b/src/controllers/playback/video/index.js
@@ -496,10 +496,10 @@ export default function (view) {
         icon.classList.remove('fullscreen_exit', 'fullscreen');
 
         if (playbackManager.isFullscreen(currentPlayer)) {
-            button.setAttribute('title', globalize.translate('ExitFullscreen') + ' (f)');
+            button.setAttribute('title', globalize.translate('ExitFullscreen') + ' (F)');
             icon.classList.add('fullscreen_exit');
         } else {
-            button.setAttribute('title', globalize.translate('Fullscreen') + ' (f)');
+            button.setAttribute('title', globalize.translate('Fullscreen') + ' (F)');
             icon.classList.add('fullscreen');
         }
     }
@@ -721,7 +721,7 @@ export default function (view) {
         }
 
         btnPlayPauseIcon.classList.add(icon);
-        dom.setElementTitle(btnPlayPause, title + ' (k)', title);
+        dom.setElementTitle(btnPlayPause, title + ' (K)', title);
     }
 
     function updatePlayerStateInternal(event, player, state) {
@@ -1245,6 +1245,7 @@ export default function (view) {
                 }
                 break;
             case 'k':
+            case 'K':
                 playbackManager.playPause(currentPlayer);
                 showOsd(btnPlayPause);
                 break;
@@ -1257,23 +1258,27 @@ export default function (view) {
                 playbackManager.volumeDown(currentPlayer);
                 break;
             case 'l':
+            case 'L':
             case 'ArrowRight':
             case 'Right':
                 playbackManager.fastForward(currentPlayer);
                 showOsd(btnFastForward);
                 break;
             case 'j':
+            case 'J':
             case 'ArrowLeft':
             case 'Left':
                 playbackManager.rewind(currentPlayer);
                 showOsd(btnRewind);
                 break;
             case 'f':
+            case 'F':
                 if (!e.ctrlKey && !e.metaKey) {
                     playbackManager.toggleFullscreen(currentPlayer);
                 }
                 break;
             case 'm':
+            case 'M':
                 playbackManager.toggleMute(currentPlayer);
                 break;
             case 'p':