mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Backport pull request #6496 from jellyfin-web/release-10.10.z

Browse source 
Skip prevented keyboard events

Original-merge: 5d8ab6a99b

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

Backported-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
dmitrylyzo 2025-02-03 12:29:42 -05:00 • committed by Joshua M. Boniface
parent 08069a42d1
commit e8f03f605a
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/playback/video/index.js
View file

@ -1246,12 +1246,14 @@ export default function (view) {
case 'ArrowLeft': case 'ArrowLeft':
case 'ArrowRight': case 'ArrowRight':
if (!e.shiftKey) { if (!e.shiftKey) {
e.preventDefault();
showOsd(nowPlayingPositionSlider); showOsd(nowPlayingPositionSlider);
nowPlayingPositionSlider.dispatchEvent(new KeyboardEvent(e.type, e)); nowPlayingPositionSlider.dispatchEvent(new KeyboardEvent(e.type, e));
} }
return; return;
case 'Enter': case 'Enter':
if (e.target.tagName !== 'BUTTON') { if (e.target.tagName !== 'BUTTON') {
e.preventDefault();
playbackManager.playPause(currentPlayer); playbackManager.playPause(currentPlayer);
showOsd(btnPlayPause); showOsd(btnPlayPause);
} }

2
src/scripts/keyboardNavigation.js
View file

@ -125,6 +125,8 @@ export function isInteractiveElement(element) {
export function enable() { export function enable() {
const hasMediaSession = 'mediaSession' in navigator; const hasMediaSession = 'mediaSession' in navigator;
window.addEventListener('keydown', function (e) { window.addEventListener('keydown', function (e) {
if (e.defaultPrevented) return;
// Skip modified keys // Skip modified keys
if (e.ctrlKey || e.altKey || e.metaKey || e.shiftKey) return; if (e.ctrlKey || e.altKey || e.metaKey || e.shiftKey) return;