cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-17 10:58:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2534 from jackrvan/issue-2376

Browse Source 
Improve behaviour of space bar pausing/playing video
This commit is contained in:
Bill Thornton 2021-06-24 01:23:33 -04:00 committed by GitHub
commit 230749369c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/controllers/playback/video/index.js
View File

@ -1,5 +1,6 @@
import { playbackManager } from '../../../components/playback/playbackmanager'; import { playbackManager } from '../../../components/playback/playbackmanager';
import SyncPlay from '../../../components/syncPlay/core'; import SyncPlay from '../../../components/syncPlay/core';
import browser from '../../../scripts/browser';
import dom from '../../../scripts/dom'; import dom from '../../../scripts/dom';
import inputManager from '../../../scripts/inputManager'; import inputManager from '../../../scripts/inputManager';
import mouseManager from '../../../scripts/mouseManager'; import mouseManager from '../../../scripts/mouseManager';
@ -987,14 +988,30 @@ import { appRouter } from '../../../components/appRouter';
*/ */
let clickedElement; let clickedElement;
function onClickCapture(e) {
// Firefox/Edge emits `click` even if `preventDefault` was used on `keydown`
// Ignore 'click' if another element was originally clicked
if (!e.target.contains(clickedElement)) {
e.preventDefault();
e.stopPropagation();
return false;
}
}
function onKeyDown(e) { function onKeyDown(e) {
clickedElement = e.target; clickedElement = e.target;
const key = keyboardnavigation.getKeyName(e); const key = keyboardnavigation.getKeyName(e);
const isKeyModified = e.ctrlKey || e.altKey || e.metaKey; const isKeyModified = e.ctrlKey || e.altKey || e.metaKey;
if (!currentVisibleMenu && e.keyCode === 32) { if (e.keyCode === 32) {
if (e.target.tagName !== 'BUTTON' || !layoutManager.tv) {
playbackManager.playPause(currentPlayer); playbackManager.playPause(currentPlayer);
e.preventDefault();
e.stopPropagation();
// Trick Firefox with a null element to skip next click
clickedElement = null;
}
showOsd(); showOsd();
return; return;
} }
@ -1304,6 +1321,9 @@ import { appRouter } from '../../../components/appRouter';
capture: true, capture: true,
passive: true passive: true
}); });
if (browser.firefox || browser.edge) {
dom.addEventListener(document, 'click', onClickCapture, { capture: true });
}
} catch (e) { } catch (e) {
appRouter.goHome(); appRouter.goHome();
} }
@ -1342,6 +1362,9 @@ import { appRouter } from '../../../components/appRouter';
capture: true, capture: true,
passive: true passive: true
}); });
if (browser.firefox || browser.edge) {
dom.removeEventListener(document, 'click', onClickCapture, { capture: true });
}
stopOsdHideTimer(); stopOsdHideTimer();
headerElement.classList.remove('osdHeader'); headerElement.classList.remove('osdHeader');
headerElement.classList.remove('osdHeader-hidden'); headerElement.classList.remove('osdHeader-hidden');
@ -1491,10 +1514,7 @@ import { appRouter } from '../../../components/appRouter';
playbackManager.previousTrack(currentPlayer); playbackManager.previousTrack(currentPlayer);
}); });
view.querySelector('.btnPause').addEventListener('click', function () { view.querySelector('.btnPause').addEventListener('click', function () {
// Ignore 'click' if another element was originally clicked (Firefox/Edge issue)
if (this.contains(clickedElement)) {
playbackManager.playPause(currentPlayer); playbackManager.playPause(currentPlayer);
}
}); });
view.querySelector('.btnNextTrack').addEventListener('click', function () { view.querySelector('.btnNextTrack').addEventListener('click', function () {
playbackManager.nextTrack(currentPlayer); playbackManager.nextTrack(currentPlayer);