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

Rearrange keydown event handling

Browse source
This commit is contained in:
Dmitry Lyzo 2020-06-28 23:46:27 +03:00
parent 39b412bb06
commit 62a2f4b17d
3 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/components/subtitlesync/subtitlesync.js
View file

@ -65,6 +65,9 @@ define(['playbackManager', 'layoutManager', 'text!./subtitlesync.template.html',
event.preventDefault(); event.preventDefault();
} }
} }
// FIXME: TV layout will require special handling for navigation keys. But now field is not focusable
event.stopPropagation();
}); });
subtitleSyncTextField.blur = function() { subtitleSyncTextField.blur = function() {

15
src/controllers/playback/videoosd.js
View file

@ -1080,7 +1080,7 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
*/ */
var clickedElement; var clickedElement;
function onWindowKeyDown(e) { function onKeyDown(e) {
clickedElement = e.srcElement; clickedElement = e.srcElement;
var key = keyboardnavigation.getKeyName(e); var key = keyboardnavigation.getKeyName(e);
@ -1194,6 +1194,13 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
} }
} }
function onKeyDownCapture() {
// Restart hide timer if OSD is currently visible
if (currentVisibleMenu) {
showOsd();
}
}
function onWindowMouseDown(e) { function onWindowMouseDown(e) {
clickedElement = e.srcElement; clickedElement = e.srcElement;
} }
@ -1330,7 +1337,8 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
}); });
showOsd(); showOsd();
inputManager.on(window, onInputCommand); inputManager.on(window, onInputCommand);
dom.addEventListener(window, 'keydown', onWindowKeyDown, { document.addEventListener('keydown', onKeyDown);
dom.addEventListener(document, 'keydown', onKeyDownCapture, {
capture: true capture: true
}); });
dom.addEventListener(window, window.PointerEvent ? 'pointerdown' : 'mousedown', onWindowMouseDown, { dom.addEventListener(window, window.PointerEvent ? 'pointerdown' : 'mousedown', onWindowMouseDown, {
@ -1350,7 +1358,8 @@ define(['playbackManager', 'dom', 'inputManager', 'datetime', 'itemHelper', 'med
statsOverlay.enabled(false); statsOverlay.enabled(false);
} }
dom.removeEventListener(window, 'keydown', onWindowKeyDown, { document.removeEventListener('keydown', onKeyDown);
dom.removeEventListener(document, 'keydown', onKeyDownCapture, {
capture: true capture: true
}); });
dom.removeEventListener(window, window.PointerEvent ? 'pointerdown' : 'mousedown', onWindowMouseDown, { dom.removeEventListener(window, window.PointerEvent ? 'pointerdown' : 'mousedown', onWindowMouseDown, {

2
src/scripts/keyboardNavigation.js
View file

@ -78,7 +78,7 @@ export function isNavigationKey(key) {
} }
export function enable() { export function enable() {
document.addEventListener('keydown', function (e) { window.addEventListener('keydown', function (e) {
const key = getKeyName(e); const key = getKeyName(e);
// Ignore navigation keys for non-TV // Ignore navigation keys for non-TV