diff --git a/src/controllers/playback/video/index.js b/src/controllers/playback/video/index.js index cb02a23dea..b6439216ce 100644 --- a/src/controllers/playback/video/index.js +++ b/src/controllers/playback/video/index.js @@ -1195,9 +1195,13 @@ export default function (view) { function onKeyDown(e) { clickedElement = e.target; - const key = keyboardnavigation.getKeyName(e); const isKeyModified = e.ctrlKey || e.altKey || e.metaKey; + // Skip modified keys + if (isKeyModified) return; + + const key = keyboardnavigation.getKeyName(e); + const btnPlayPause = osdBottomElement.querySelector('.btnPause'); if (e.keyCode === 32) { @@ -1219,8 +1223,10 @@ export default function (view) { switch (key) { case 'ArrowLeft': case 'ArrowRight': - showOsd(nowPlayingPositionSlider); - nowPlayingPositionSlider.dispatchEvent(new KeyboardEvent(e.type, e)); + if (!e.shiftKey) { + showOsd(nowPlayingPositionSlider); + nowPlayingPositionSlider.dispatchEvent(new KeyboardEvent(e.type, e)); + } return; case 'Enter': playbackManager.playPause(currentPlayer); @@ -1230,7 +1236,7 @@ export default function (view) { } if (layoutManager.tv && keyboardnavigation.isNavigationKey(key)) { - showOsd(); + if (!e.shiftKey) showOsd(); return; } @@ -1248,47 +1254,59 @@ export default function (view) { break; case 'k': case 'K': - e.preventDefault(); - playbackManager.playPause(currentPlayer); - showOsd(btnPlayPause); + if (!e.shiftKey) { + e.preventDefault(); + playbackManager.playPause(currentPlayer); + showOsd(btnPlayPause); + } break; case 'ArrowUp': case 'Up': - e.preventDefault(); - playbackManager.volumeUp(currentPlayer); + if (!e.shiftKey) { + e.preventDefault(); + playbackManager.volumeUp(currentPlayer); + } break; case 'ArrowDown': case 'Down': - e.preventDefault(); - playbackManager.volumeDown(currentPlayer); + if (!e.shiftKey) { + e.preventDefault(); + playbackManager.volumeDown(currentPlayer); + } break; case 'l': case 'L': case 'ArrowRight': case 'Right': - e.preventDefault(); - playbackManager.fastForward(currentPlayer); - showOsd(btnFastForward); + if (!e.shiftKey) { + e.preventDefault(); + playbackManager.fastForward(currentPlayer); + showOsd(btnFastForward); + } break; case 'j': case 'J': case 'ArrowLeft': case 'Left': - e.preventDefault(); - playbackManager.rewind(currentPlayer); - showOsd(btnRewind); + if (!e.shiftKey) { + e.preventDefault(); + playbackManager.rewind(currentPlayer); + showOsd(btnRewind); + } break; case 'f': case 'F': - if (!e.ctrlKey && !e.metaKey) { + if (!e.shiftKey) { e.preventDefault(); playbackManager.toggleFullscreen(currentPlayer); } break; case 'm': case 'M': - e.preventDefault(); - playbackManager.toggleMute(currentPlayer); + if (!e.shiftKey) { + e.preventDefault(); + playbackManager.toggleMute(currentPlayer); + } break; case 'p': case 'P': @@ -1323,12 +1341,16 @@ export default function (view) { } break; case 'Home': - e.preventDefault(); - playbackManager.seekPercent(0, currentPlayer); + if (!e.shiftKey) { + e.preventDefault(); + playbackManager.seekPercent(0, currentPlayer); + } break; case 'End': - e.preventDefault(); - playbackManager.seekPercent(100, currentPlayer); + if (!e.shiftKey) { + e.preventDefault(); + playbackManager.seekPercent(100, currentPlayer); + } break; case '0': case '1': @@ -1339,39 +1361,45 @@ export default function (view) { case '6': case '7': case '8': - case '9': { - if (!isKeyModified) { - e.preventDefault(); - const percent = parseInt(key, 10) * 10; - playbackManager.seekPercent(percent, currentPlayer); - } + case '9': { // no Shift + e.preventDefault(); + const percent = parseInt(key, 10) * 10; + playbackManager.seekPercent(percent, currentPlayer); break; } - case '>': + case '>': // Shift+. e.preventDefault(); playbackManager.increasePlaybackRate(currentPlayer); break; - case '<': + case '<': // Shift+, e.preventDefault(); playbackManager.decreasePlaybackRate(currentPlayer); break; case 'PageUp': - e.preventDefault(); - playbackManager.nextChapter(currentPlayer); + if (!e.shiftKey) { + e.preventDefault(); + playbackManager.nextChapter(currentPlayer); + } break; case 'PageDown': - e.preventDefault(); - playbackManager.previousChapter(currentPlayer); + if (!e.shiftKey) { + e.preventDefault(); + playbackManager.previousChapter(currentPlayer); + } break; case 'g': case 'G': - e.preventDefault(); - subtitleSyncOverlay?.decrementOffset(); + if (!e.shiftKey) { + e.preventDefault(); + subtitleSyncOverlay?.decrementOffset(); + } break; case 'h': case 'H': - e.preventDefault(); - subtitleSyncOverlay?.incrementOffset(); + if (!e.shiftKey) { + e.preventDefault(); + subtitleSyncOverlay?.incrementOffset(); + } break; } } diff --git a/src/plugins/bookPlayer/plugin.js b/src/plugins/bookPlayer/plugin.js index d9ea979483..733519cb38 100644 --- a/src/plugins/bookPlayer/plugin.js +++ b/src/plugins/bookPlayer/plugin.js @@ -131,6 +131,9 @@ export class BookPlayer { } onWindowKeyDown(e) { + // Skip modified keys + if (e.ctrlKey || e.altKey || e.metaKey || e.shiftKey) return; + const key = keyboardnavigation.getKeyName(e); if (!this.loaded) return; diff --git a/src/plugins/comicsPlayer/plugin.js b/src/plugins/comicsPlayer/plugin.js index 295b844bcf..0e8f599a1b 100644 --- a/src/plugins/comicsPlayer/plugin.js +++ b/src/plugins/comicsPlayer/plugin.js @@ -178,6 +178,9 @@ export class ComicsPlayer { } onWindowKeyDown(e) { + // Skip modified keys + if (e.ctrlKey || e.altKey || e.metaKey || e.shiftKey) return; + const key = keyboardnavigation.getKeyName(e); if (key === 'Escape') { e.preventDefault(); diff --git a/src/plugins/pdfPlayer/plugin.js b/src/plugins/pdfPlayer/plugin.js index 8ee7bddae8..7b7e3fa4b8 100644 --- a/src/plugins/pdfPlayer/plugin.js +++ b/src/plugins/pdfPlayer/plugin.js @@ -91,6 +91,9 @@ export class PdfPlayer { onWindowKeyDown(e) { if (!this.loaded) return; + // Skip modified keys + if (e.ctrlKey || e.altKey || e.metaKey || e.shiftKey) return; + const key = keyboardnavigation.getKeyName(e); switch (key) { diff --git a/src/scripts/keyboardNavigation.js b/src/scripts/keyboardNavigation.js index ed13e90415..8b1778ebf4 100644 --- a/src/scripts/keyboardNavigation.js +++ b/src/scripts/keyboardNavigation.js @@ -125,6 +125,9 @@ export function isInteractiveElement(element) { export function enable() { const hasMediaSession = 'mediaSession' in navigator; window.addEventListener('keydown', function (e) { + // Skip modified keys + if (e.ctrlKey || e.altKey || e.metaKey || e.shiftKey) return; + const key = getKeyName(e); // Ignore navigation keys for non-TV