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

Ignore modified hotkeys

Browse source
This commit is contained in:
Dmitry Lyzo 2024-09-10 03:53:43 +03:00
parent b2676c1633
commit 3025e9bf48
5 changed files with 80 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1195,9 +1195,13 @@ export default function (view) {
function onKeyDown(e) { function onKeyDown(e) {
clickedElement = e.target; clickedElement = e.target;
const key = keyboardnavigation.getKeyName(e);
const isKeyModified = e.ctrlKey || e.altKey || e.metaKey; const isKeyModified = e.ctrlKey || e.altKey || e.metaKey;
// Skip modified keys
if (isKeyModified) return;
const key = keyboardnavigation.getKeyName(e);
const btnPlayPause = osdBottomElement.querySelector('.btnPause'); const btnPlayPause = osdBottomElement.querySelector('.btnPause');
if (e.keyCode === 32) { if (e.keyCode === 32) {
@ -1219,8 +1223,10 @@ export default function (view) {
switch (key) { switch (key) {
case 'ArrowLeft': case 'ArrowLeft':
case 'ArrowRight': case 'ArrowRight':
showOsd(nowPlayingPositionSlider); if (!e.shiftKey) {
nowPlayingPositionSlider.dispatchEvent(new KeyboardEvent(e.type, e)); showOsd(nowPlayingPositionSlider);
nowPlayingPositionSlider.dispatchEvent(new KeyboardEvent(e.type, e));
}
return; return;
case 'Enter': case 'Enter':
playbackManager.playPause(currentPlayer); playbackManager.playPause(currentPlayer);
@ -1230,7 +1236,7 @@ export default function (view) {
} }
if (layoutManager.tv && keyboardnavigation.isNavigationKey(key)) { if (layoutManager.tv && keyboardnavigation.isNavigationKey(key)) {
showOsd(); if (!e.shiftKey) showOsd();
return; return;
} }
@ -1248,47 +1254,59 @@ export default function (view) {
break; break;
case 'k': case 'k':
case 'K': case 'K':
e.preventDefault(); if (!e.shiftKey) {
playbackManager.playPause(currentPlayer); e.preventDefault();
showOsd(btnPlayPause); playbackManager.playPause(currentPlayer);
showOsd(btnPlayPause);
}
break; break;
case 'ArrowUp': case 'ArrowUp':
case 'Up': case 'Up':
e.preventDefault(); if (!e.shiftKey) {
playbackManager.volumeUp(currentPlayer); e.preventDefault();
playbackManager.volumeUp(currentPlayer);
}
break; break;
case 'ArrowDown': case 'ArrowDown':
case 'Down': case 'Down':
e.preventDefault(); if (!e.shiftKey) {
playbackManager.volumeDown(currentPlayer); e.preventDefault();
playbackManager.volumeDown(currentPlayer);
}
break; break;
case 'l': case 'l':
case 'L': case 'L':
case 'ArrowRight': case 'ArrowRight':
case 'Right': case 'Right':
e.preventDefault(); if (!e.shiftKey) {
playbackManager.fastForward(currentPlayer); e.preventDefault();
showOsd(btnFastForward); playbackManager.fastForward(currentPlayer);
showOsd(btnFastForward);
}
break; break;
case 'j': case 'j':
case 'J': case 'J':
case 'ArrowLeft': case 'ArrowLeft':
case 'Left': case 'Left':
e.preventDefault(); if (!e.shiftKey) {
playbackManager.rewind(currentPlayer); e.preventDefault();
showOsd(btnRewind); playbackManager.rewind(currentPlayer);
showOsd(btnRewind);
}
break; break;
case 'f': case 'f':
case 'F': case 'F':
if (!e.ctrlKey && !e.metaKey) { if (!e.shiftKey) {
e.preventDefault(); e.preventDefault();
playbackManager.toggleFullscreen(currentPlayer); playbackManager.toggleFullscreen(currentPlayer);
} }
break; break;
case 'm': case 'm':
case 'M': case 'M':
e.preventDefault(); if (!e.shiftKey) {
playbackManager.toggleMute(currentPlayer); e.preventDefault();
playbackManager.toggleMute(currentPlayer);
}
break; break;
case 'p': case 'p':
case 'P': case 'P':
@ -1323,12 +1341,16 @@ export default function (view) {
} }
break; break;
case 'Home': case 'Home':
e.preventDefault(); if (!e.shiftKey) {
playbackManager.seekPercent(0, currentPlayer); e.preventDefault();
playbackManager.seekPercent(0, currentPlayer);
}
break; break;
case 'End': case 'End':
e.preventDefault(); if (!e.shiftKey) {
playbackManager.seekPercent(100, currentPlayer); e.preventDefault();
playbackManager.seekPercent(100, currentPlayer);
}
break; break;
case '0': case '0':
case '1': case '1':
@ -1339,39 +1361,45 @@ export default function (view) {
case '6': case '6':
case '7': case '7':
case '8': case '8':
case '9': { case '9': { // no Shift
if (!isKeyModified) { e.preventDefault();
e.preventDefault(); const percent = parseInt(key, 10) * 10;
const percent = parseInt(key, 10) * 10; playbackManager.seekPercent(percent, currentPlayer);
playbackManager.seekPercent(percent, currentPlayer);
}
break; break;
} }
case '>': case '>': // Shift+.
e.preventDefault(); e.preventDefault();
playbackManager.increasePlaybackRate(currentPlayer); playbackManager.increasePlaybackRate(currentPlayer);
break; break;
case '<': case '<': // Shift+,
e.preventDefault(); e.preventDefault();
playbackManager.decreasePlaybackRate(currentPlayer); playbackManager.decreasePlaybackRate(currentPlayer);
break; break;
case 'PageUp': case 'PageUp':
e.preventDefault(); if (!e.shiftKey) {
playbackManager.nextChapter(currentPlayer); e.preventDefault();
playbackManager.nextChapter(currentPlayer);
}
break; break;
case 'PageDown': case 'PageDown':
e.preventDefault(); if (!e.shiftKey) {
playbackManager.previousChapter(currentPlayer); e.preventDefault();
playbackManager.previousChapter(currentPlayer);
}
break; break;
case 'g': case 'g':
case 'G': case 'G':
e.preventDefault(); if (!e.shiftKey) {
subtitleSyncOverlay?.decrementOffset(); e.preventDefault();
subtitleSyncOverlay?.decrementOffset();
}
break; break;
case 'h': case 'h':
case 'H': case 'H':
e.preventDefault(); if (!e.shiftKey) {
subtitleSyncOverlay?.incrementOffset(); e.preventDefault();
subtitleSyncOverlay?.incrementOffset();
}
break; break;
} }
} }

3
src/plugins/bookPlayer/plugin.js
View file

@ -131,6 +131,9 @@ export class BookPlayer {
} }
onWindowKeyDown(e) { onWindowKeyDown(e) {
// Skip modified keys
if (e.ctrlKey || e.altKey || e.metaKey || e.shiftKey) return;
const key = keyboardnavigation.getKeyName(e); const key = keyboardnavigation.getKeyName(e);
if (!this.loaded) return; if (!this.loaded) return;

3
src/plugins/comicsPlayer/plugin.js
View file

@ -178,6 +178,9 @@ export class ComicsPlayer {
} }
onWindowKeyDown(e) { onWindowKeyDown(e) {
// Skip modified keys
if (e.ctrlKey || e.altKey || e.metaKey || e.shiftKey) return;
const key = keyboardnavigation.getKeyName(e); const key = keyboardnavigation.getKeyName(e);
if (key === 'Escape') { if (key === 'Escape') {
e.preventDefault(); e.preventDefault();

3
src/plugins/pdfPlayer/plugin.js
View file

@ -91,6 +91,9 @@ export class PdfPlayer {
onWindowKeyDown(e) { onWindowKeyDown(e) {
if (!this.loaded) return; if (!this.loaded) return;
// Skip modified keys
if (e.ctrlKey || e.altKey || e.metaKey || e.shiftKey) return;
const key = keyboardnavigation.getKeyName(e); const key = keyboardnavigation.getKeyName(e);
switch (key) { switch (key) {

3
src/scripts/keyboardNavigation.js
View file

@ -125,6 +125,9 @@ 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) {
// Skip modified keys
if (e.ctrlKey || e.altKey || e.metaKey || e.shiftKey) return;
const key = getKeyName(e); const key = getKeyName(e);
// Ignore navigation keys for non-TV // Ignore navigation keys for non-TV